Merge pull request #876 from tseaver/825-storage-remove_bucket_connec…

…tion

Remove 'Bucket.connection' property

gcloud/storage/__init__.py

@@ -78,10 +78,9 @@ def set_default_bucket(bucket=None):
     """
     if bucket is None:
         bucket_name = os.getenv(_BUCKET_ENV_VAR_NAME)
-        connection = get_default_connection()
 
-        if bucket_name is not None and connection is not None:
-            bucket = Bucket(bucket_name, connection=connection)
+        if bucket_name is not None:
+            bucket = Bucket(bucket_name)
 
     if bucket is not None:
         _implicit_environ._DEFAULTS.bucket = bucket

gcloud/storage/api.py

@@ -50,7 +50,6 @@ def lookup_bucket(bucket_name, connection=None):
     :rtype: :class:`gcloud.storage.bucket.Bucket`
     :returns: The bucket matching the name provided or None if not found.
     """
-    connection = _require_connection(connection)
     try:
         return get_bucket(bucket_name, connection=connection)
     except NotFound:
@@ -104,7 +103,6 @@ def list_buckets(project=None, max_results=None, page_token=None, prefix=None,
     :rtype: iterable of :class:`gcloud.storage.bucket.Bucket` objects.
     :returns: All buckets belonging to this project.
     """
-    connection = _require_connection(connection)
     if project is None:
         project = get_default_project()
     extra_params = {'project': project}
@@ -159,7 +157,7 @@ def get_bucket(bucket_name, connection=None):
     :raises: :class:`gcloud.exceptions.NotFound`
     """
     connection = _require_connection(connection)
-    bucket = Bucket(bucket_name, connection=connection)
+    bucket = Bucket(bucket_name)
     bucket.reload(connection=connection)
     return bucket
 
@@ -195,7 +193,7 @@ def create_bucket(bucket_name, project=None, connection=None):
     :returns: The newly created bucket.
     """
     connection = _require_connection(connection)
-    bucket = Bucket(bucket_name, connection=connection)
+    bucket = Bucket(bucket_name)
     bucket.create(project, connection=connection)
     return bucket
 
@@ -212,6 +210,7 @@ class _BucketIterator(Iterator):
     """
 
     def __init__(self, connection, extra_params=None):
+        connection = _require_connection(connection)
         super(_BucketIterator, self).__init__(connection=connection, path='/b',
                                               extra_params=extra_params)
 
@@ -223,6 +222,6 @@ def get_items_from_response(self, response):
         """
         for item in response.get('items', []):
             name = item.get('name')
-            bucket = Bucket(name, connection=self.connection)
+            bucket = Bucket(name)
             bucket._set_properties(item)
             yield bucket

gcloud/storage/blob.py

@@ -250,6 +250,7 @@ def rename(self, new_name, connection=None):
         :rtype: :class:`Blob`
         :returns: The newly-copied blob.
         """
+        connection = _require_connection(connection)
         new_blob = self.bucket.copy_blob(self, self.bucket, new_name,
                                          connection=connection)
         self.delete(connection=connection)
@@ -269,6 +270,7 @@ def delete(self, connection=None):
                  (propagated from
                  :meth:`gcloud.storage.bucket.Bucket.delete_blob`).
         """
+        connection = _require_connection(connection)
         return self.bucket.delete_blob(self.name, connection=connection)
 
     def download_to_file(self, file_obj, connection=None):

gcloud/storage/bucket.py

@@ -96,9 +96,6 @@ class Bucket(_PropertyMixin):
     :type name: string
     :param name: The name of the bucket.
 
-    :type connection: :class:`gcloud.storage.connection.Connection`
-    :param connection: The connection to use when sending requests.
-
     :type properties: dictionary or ``NoneType``
     :param properties: The properties associated with the bucket.
     """
@@ -196,15 +193,6 @@ def default_object_acl(self):
         """Create our defaultObjectACL on demand."""
         return self._default_object_acl
 
-    @property
-    def connection(self):
-        """Getter property for the connection to use with this Bucket.
-
-        :rtype: :class:`gcloud.storage.connection.Connection`
-        :returns: The connection to use.
-        """
-        return self._connection
-
     @staticmethod
     def path_helper(bucket_name):
         """Relative URL path for a bucket.

gcloud/storage/test___init__.py

@@ -58,7 +58,6 @@ def test_set_from_env_var(self):
 
                 default_bucket = _implicit_environ.get_default_bucket()
                 self.assertEqual(default_bucket.name, IMPLICIT_BUCKET_NAME)
-                self.assertEqual(default_bucket.connection, CONNECTION)
 
     def test_set_explicit_w_env_var_set(self):
         from gcloud.storage._testing import _monkey_defaults
@@ -113,7 +112,6 @@ def test_set_explicit_None_w_env_var_set(self):
 
                 default_bucket = _implicit_environ.get_default_bucket()
                 self.assertEqual(default_bucket.name, IMPLICIT_BUCKET_NAME)
-                self.assertEqual(default_bucket.connection, CONNECTION)
 
 
 class Test_set_defaults(unittest2.TestCase):

gcloud/storage/test_api.py

@@ -66,7 +66,6 @@ def _lookup_bucket_hit_helper(self, use_default=False):
             bucket = self._callFUT(BLOB_NAME, connection=conn)
 
         self.assertTrue(isinstance(bucket, Bucket))
-        self.assertTrue(bucket.connection is conn)
         self.assertEqual(bucket.name, BLOB_NAME)
         self.assertEqual(http._called_with['method'], 'GET')
         self.assertEqual(http._called_with['uri'], URI)
@@ -256,7 +255,6 @@ def _get_bucket_hit_helper(self, use_default=False):
             bucket = self._callFUT(BLOB_NAME, connection=conn)
 
         self.assertTrue(isinstance(bucket, Bucket))
-        self.assertTrue(bucket.connection is conn)
         self.assertEqual(bucket.name, BLOB_NAME)
         self.assertEqual(http._called_with['method'], 'GET')
         self.assertEqual(http._called_with['uri'], URI)
@@ -301,7 +299,6 @@ def _create_bucket_success_helper(self, project, use_default=False):
             bucket = self._callFUT(BLOB_NAME, project=project, connection=conn)
 
         self.assertTrue(isinstance(bucket, Bucket))
-        self.assertTrue(bucket.connection is conn)
         self.assertEqual(bucket.name, BLOB_NAME)
         self.assertEqual(http._called_with['method'], 'POST')
         self.assertEqual(http._called_with['uri'], URI)
@@ -325,7 +322,6 @@ def _makeOne(self, *args, **kw):
     def test_ctor(self):
         connection = object()
         iterator = self._makeOne(connection)
-        self.assertTrue(iterator.connection is connection)
         self.assertEqual(iterator.path, '/b')
         self.assertEqual(iterator.page_number, 0)
         self.assertEqual(iterator.next_page_token, None)
@@ -345,7 +341,6 @@ def test_get_items_from_response_non_empty(self):
         self.assertEqual(len(buckets), 1)
         bucket = buckets[0]
         self.assertTrue(isinstance(bucket, Bucket))
-        self.assertTrue(bucket.connection is connection)
         self.assertEqual(bucket.name, BLOB_NAME)