Merge pull request #2942 from daspecster/update-import-spacing-1

Update import spacing in tests.

Author: daspecster

packages/google-cloud-storage/unit_tests/test__helpers.py

@@ -20,6 +20,7 @@ class Test_PropertyMixin(unittest.TestCase):
     @staticmethod
     def _get_target_class():
         from google.cloud.storage._helpers import _PropertyMixin
+
         return _PropertyMixin
 
     def _make_one(self, *args, **kw):
@@ -99,6 +100,7 @@ class Test__scalar_property(unittest.TestCase):
 
     def _call_fut(self, fieldName):
         from google.cloud.storage._helpers import _scalar_property
+
         return _scalar_property(fieldName)
 
     def test_getter(self):
@@ -127,10 +129,12 @@ class Test__base64_md5hash(unittest.TestCase):
 
     def _call_fut(self, bytes_to_sign):
         from google.cloud.storage._helpers import _base64_md5hash
+
         return _base64_md5hash(bytes_to_sign)
 
     def test_it(self):
         from io import BytesIO
+
         BYTES_TO_SIGN = b'FOO'
         BUFFER = BytesIO()
         BUFFER.write(BYTES_TO_SIGN)

packages/google-cloud-storage/unit_tests/test__http.py

@@ -20,6 +20,7 @@ class TestConnection(unittest.TestCase):
     @staticmethod
     def _get_target_class():
         from google.cloud.storage._http import Connection
+
         return Connection
 
     def _make_one(self, *args, **kw):
@@ -38,6 +39,7 @@ def test_build_api_url_no_extra_query_params(self):
     def test_build_api_url_w_extra_query_params(self):
         from six.moves.urllib.parse import parse_qsl
         from six.moves.urllib.parse import urlsplit
+
         conn = self._make_one()
         uri = conn.build_api_url('/foo', {'bar': 'baz'})
         scheme, netloc, path, qs, _ = urlsplit(uri)

packages/google-cloud-storage/unit_tests/test_acl.py

@@ -20,6 +20,7 @@ class Test_ACLEntity(unittest.TestCase):
     @staticmethod
     def _get_target_class():
         from google.cloud.storage.acl import _ACLEntity
+
         return _ACLEntity
 
     def _make_one(self, *args, **kw):
@@ -130,6 +131,7 @@ class Test_ACL(unittest.TestCase):
     @staticmethod
     def _get_target_class():
         from google.cloud.storage.acl import ACL
+
         return ACL
 
     def _make_one(self, *args, **kw):
@@ -270,6 +272,7 @@ def _reload():
 
     def test_has_entity_miss_entity(self):
         from google.cloud.storage.acl import _ACLEntity
+
         TYPE = 'type'
         ID = 'id'
         entity = _ACLEntity(TYPE, ID)
@@ -310,6 +313,7 @@ def _reload():
 
     def test_get_entity_miss_entity_no_default(self):
         from google.cloud.storage.acl import _ACLEntity
+
         TYPE = 'type'
         ID = 'id'
         entity = _ACLEntity(TYPE, ID)
@@ -325,6 +329,7 @@ def test_get_entity_miss_str_w_default(self):
 
     def test_get_entity_miss_entity_w_default(self):
         from google.cloud.storage.acl import _ACLEntity
+
         DEFAULT = object()
         TYPE = 'type'
         ID = 'id'
@@ -351,6 +356,7 @@ def test_get_entity_hit_entity(self):
 
     def test_add_entity_miss_eager(self):
         from google.cloud.storage.acl import _ACLEntity
+
         TYPE = 'type'
         ID = 'id'
         ROLE = 'role'
@@ -366,6 +372,7 @@ def test_add_entity_miss_eager(self):
 
     def test_add_entity_miss_lazy(self):
         from google.cloud.storage.acl import _ACLEntity
+
         TYPE = 'type'
         ID = 'id'
         ROLE = 'role'
@@ -386,6 +393,7 @@ def _reload():
 
     def test_add_entity_hit(self):
         from google.cloud.storage.acl import _ACLEntity
+
         TYPE = 'type'
         ID = 'id'
         ENTITY_VAL = '%s-%s' % (TYPE, ID)
@@ -715,6 +723,7 @@ class Test_BucketACL(unittest.TestCase):
     @staticmethod
     def _get_target_class():
         from google.cloud.storage.acl import BucketACL
+
         return BucketACL
 
     def _make_one(self, *args, **kw):
@@ -736,6 +745,7 @@ class Test_DefaultObjectACL(unittest.TestCase):
     @staticmethod
     def _get_target_class():
         from google.cloud.storage.acl import DefaultObjectACL
+
         return DefaultObjectACL
 
     def _make_one(self, *args, **kw):
@@ -757,6 +767,7 @@ class Test_ObjectACL(unittest.TestCase):
     @staticmethod
     def _get_target_class():
         from google.cloud.storage.acl import ObjectACL
+
         return ObjectACL
 
     def _make_one(self, *args, **kw):

packages/google-cloud-storage/unit_tests/test_batch.py

@@ -19,6 +19,7 @@
 
 def _make_credentials():
     import google.auth.credentials
+
     return mock.Mock(spec=google.auth.credentials.Credentials)
 
 
@@ -27,6 +28,7 @@ class TestMIMEApplicationHTTP(unittest.TestCase):
     @staticmethod
     def _get_target_class():
         from google.cloud.storage.batch import MIMEApplicationHTTP
+
         return MIMEApplicationHTTP
 
     def _make_one(self, *args, **kw):
@@ -79,6 +81,7 @@ class TestBatch(unittest.TestCase):
     @staticmethod
     def _get_target_class():
         from google.cloud.storage.batch import Batch
+
         return Batch
 
     def _make_one(self, *args, **kw):
@@ -95,6 +98,7 @@ def test_ctor(self):
 
     def test_current(self):
         from google.cloud.storage.client import Client
+
         project = 'PROJECT'
         credentials = _make_credentials()
         client = Client(project=project, credentials=credentials)
@@ -110,6 +114,7 @@ def test_current(self):
 
     def test__make_request_GET_normal(self):
         from google.cloud.storage.batch import _FutureDict
+
         URL = 'http://example.com/api'
         expected = _Response()
         http = _HTTP((expected, ''))
@@ -136,6 +141,7 @@ def test__make_request_GET_normal(self):
 
     def test__make_request_POST_normal(self):
         from google.cloud.storage.batch import _FutureDict
+
         URL = 'http://example.com/api'
         http = _HTTP()  # no requests expected
         connection = _Connection(http=http)
@@ -161,6 +167,7 @@ def test__make_request_POST_normal(self):
 
     def test__make_request_PATCH_normal(self):
         from google.cloud.storage.batch import _FutureDict
+
         URL = 'http://example.com/api'
         http = _HTTP()  # no requests expected
         connection = _Connection(http=http)
@@ -186,6 +193,7 @@ def test__make_request_PATCH_normal(self):
 
     def test__make_request_DELETE_normal(self):
         from google.cloud.storage.batch import _FutureDict
+
         URL = 'http://example.com/api'
         http = _HTTP()  # no requests expected
         connection = _Connection(http=http)
@@ -241,6 +249,7 @@ def _check_subrequest_no_payload(self, chunk, method, url):
 
     def _check_subrequest_payload(self, chunk, method, url, payload):
         import json
+
         lines = chunk.splitlines()
         # blank + 2 headers + blank + request + 2 headers + blank + body
         payload_str = json.dumps(payload)
@@ -262,6 +271,7 @@ def _check_subrequest_payload(self, chunk, method, url, payload):
 
     def test_finish_nonempty(self):
         import httplib2
+
         URL = 'http://api.example.com/other_api'
         expected = _Response()
         expected['content-type'] = 'multipart/mixed; boundary="DEADBEEF="'
@@ -325,6 +335,7 @@ def test_finish_responses_mismatch(self):
 
     def test_finish_nonempty_with_status_failure(self):
         from google.cloud.exceptions import NotFound
+
         URL = 'http://api.example.com/other_api'
         expected = _Response()
         expected['content-type'] = 'multipart/mixed; boundary="DEADBEEF="'
@@ -380,6 +391,7 @@ def test_finish_nonempty_non_multipart_response(self):
 
     def test_as_context_mgr_wo_error(self):
         from google.cloud.storage.client import Client
+
         URL = 'http://example.com/api'
         expected = _Response()
         expected['content-type'] = 'multipart/mixed; boundary="DEADBEEF="'
@@ -417,6 +429,7 @@ def test_as_context_mgr_wo_error(self):
     def test_as_context_mgr_w_error(self):
         from google.cloud.storage.batch import _FutureDict
         from google.cloud.storage.client import Client
+
         URL = 'http://example.com/api'
         http = _HTTP()
         connection = _Connection(http=http)
@@ -457,10 +470,12 @@ class Test__unpack_batch_response(unittest.TestCase):
 
     def _call_fut(self, response, content):
         from google.cloud.storage.batch import _unpack_batch_response
+
         return _unpack_batch_response(response, content)
 
     def _unpack_helper(self, response, content):
         import httplib2
+
         result = list(self._call_fut(response, content))
         self.assertEqual(len(result), 3)
         response0 = httplib2.Response({
@@ -548,6 +563,7 @@ class Test__FutureDict(unittest.TestCase):
 
     def _make_one(self, *args, **kw):
         from google.cloud.storage.batch import _FutureDict
+
         return _FutureDict(*args, **kw)
 
     def test_get(self):
@@ -580,14 +596,12 @@ def _make_request(self, method, url, data=None, headers=None):
 
 
 class _Response(dict):
-
     def __init__(self, status=200, **kw):
         self.status = status
         super(_Response, self).__init__(**kw)
 
 
 class _HTTP(object):
-
     def __init__(self, *responses):
         self._requests = []
         self._responses = list(responses)