Making all Blob/Bucket getters fail gracefully if keys don't exist.

Also replacing uses of dict.copy() (shallow) with copy.deepcopy().

Author: dhermes

gcloud/exceptions.py

@@ -17,6 +17,7 @@
 See: https://cloud.google.com/storage/docs/json_api/v1/status-codes
 """
 
+import copy
 import json
 import six
 
@@ -38,7 +39,7 @@ def __init__(self, message, errors=()):
         super(GCloudError, self).__init__()
         # suppress deprecation warning under 2.6.x
         self.message = message
-        self._errors = [error.copy() for error in errors]
+        self._errors = errors
 
     def __str__(self):
         return '%d %s' % (self.code, self.message)
@@ -50,7 +51,7 @@ def errors(self):
         :rtype: list(dict)
         :returns: a list of mappings describing each error.
         """
-        return [error.copy() for error in self._errors]
+        return [copy.deepcopy(error) for error in self._errors]
 
 
 class Redirection(GCloudError):

gcloud/storage/blob.py

@@ -485,7 +485,7 @@ def component_count(self):
 
         :rtype: integer
         """
-        return self._properties['componentCount']
+        return self._properties.get('componentCount')
 
     @property
     def etag(self):
@@ -496,7 +496,7 @@ def etag(self):
 
         :rtype: string
         """
-        return self._properties['etag']
+        return self._properties.get('etag')
 
     @property
     def generation(self):
@@ -506,7 +506,7 @@ def generation(self):
 
         :rtype: integer
         """
-        return self._properties['generation']
+        return self._properties.get('generation')
 
     @property
     def id(self):
@@ -516,7 +516,7 @@ def id(self):
 
         :rtype: string
         """
-        return self._properties['id']
+        return self._properties.get('id')
 
     md5_hash = _scalar_property('md5Hash')
     """MD5 hash for this object.
@@ -535,7 +535,7 @@ def media_link(self):
 
         :rtype: string
         """
-        return self._properties['mediaLink']
+        return self._properties.get('mediaLink')
 
     @property
     def metadata(self):
@@ -545,7 +545,7 @@ def metadata(self):
 
         :rtype: dict
         """
-        return copy.deepcopy(self._properties['metadata'])
+        return copy.deepcopy(self._properties.get('metadata'))
 
     @metadata.setter
     def metadata(self, value):
@@ -565,7 +565,7 @@ def metageneration(self):
 
         :rtype: integer
         """
-        return self._properties['metageneration']
+        return self._properties.get('metageneration')
 
     @property
     def owner(self):
@@ -576,7 +576,7 @@ def owner(self):
         :rtype: dict
         :returns: mapping of owner's role/ID.
         """
-        return self._properties['owner'].copy()
+        return copy.deepcopy(self._properties.get('owner'))
 
     @property
     def self_link(self):
@@ -586,7 +586,7 @@ def self_link(self):
 
         :rtype: string
         """
-        return self._properties['selfLink']
+        return self._properties.get('selfLink')
 
     @property
     def size(self):
@@ -596,7 +596,7 @@ def size(self):
 
         :rtype: integer
         """
-        return self._properties['size']
+        return self._properties.get('size')
 
     @property
     def storage_class(self):
@@ -608,7 +608,7 @@ def storage_class(self):
         :rtype: string
         :returns: Currently one of "STANDARD", "DURABLE_REDUCED_AVAILABILITY"
         """
-        return self._properties['storageClass']
+        return self._properties.get('storageClass')
 
     @property
     def time_deleted(self):
@@ -631,7 +631,7 @@ def updated(self):
         :rtype: string
         :returns: timestamp in RFC 3339 format.
         """
-        return self._properties['updated']
+        return self._properties.get('updated')
 
 
 class _UploadConfig(object):

gcloud/storage/bucket.py

@@ -515,7 +515,7 @@ def etag(self):
 
         :rtype: string
         """
-        return self._properties['etag']
+        return self._properties.get('etag')
 
     @property
     def id(self):
@@ -525,7 +525,7 @@ def id(self):
 
         :rtype: string
         """
-        return self._properties['id']
+        return self._properties.get('id')
 
     @property
     def lifecycle_rules(self):
@@ -571,8 +571,7 @@ def get_logging(self):
                   (if logging is enabled), or None (if not).
         """
         info = self._properties.get('logging')
-        if info is not None:
-            return info.copy()
+        return copy.deepcopy(info)
 
     def enable_logging(self, bucket_name, object_prefix=''):
         """Enable access logging for this bucket.
@@ -603,7 +602,7 @@ def metageneration(self):
 
         :rtype: integer
         """
-        return self._properties['metageneration']
+        return self._properties.get('metageneration')
 
     @property
     def owner(self):
@@ -614,7 +613,7 @@ def owner(self):
         :rtype: dict
         :returns: mapping of owner's role/ID.
         """
-        return self._properties['owner'].copy()
+        return copy.deepcopy(self._properties.get('owner'))
 
     @property
     def project_number(self):
@@ -624,7 +623,7 @@ def project_number(self):
 
         :rtype: integer
         """
-        return self._properties['projectNumber']
+        return self._properties.get('projectNumber')
 
     @property
     def self_link(self):
@@ -634,7 +633,7 @@ def self_link(self):
 
         :rtype: string
         """
-        return self._properties['selfLink']
+        return self._properties.get('selfLink')
 
     @property
     def storage_class(self):
@@ -646,7 +645,7 @@ def storage_class(self):
         :rtype: string
         :returns: Currently one of "STANDARD", "DURABLE_REDUCED_AVAILABILITY"
         """
-        return self._properties['storageClass']
+        return self._properties.get('storageClass')
 
     @property
     def time_created(self):
@@ -657,7 +656,7 @@ def time_created(self):
         :rtype: string
         :returns: timestamp in RFC 3339 format.
         """
-        return self._properties['timeCreated']
+        return self._properties.get('timeCreated')
 
     @property
     def versioning_enabled(self):