Merge pull request #2703 from dhermes/connection-non-public

Making base connection module non-public and making connection attribute non-public

Author: dhermes

…le-cloud-core/google/cloud/connection.py …/google-cloud-core/google/cloud/_http.pypackages/google-cloud-core/google/cloud/connection.py renamed to packages/google-cloud-core/google/cloud/_http.py packages/google-cloud-core/google/cloud/connection.py renamed to packages/google-cloud-core/google/cloud/_http.py

@@ -18,7 +18,7 @@
 import six
 
 from google.cloud._helpers import _determine_default_project
-from google.cloud.connection import Connection
+from google.cloud._http import Connection
 from google.cloud.credentials import get_credentials
 
 
@@ -120,7 +120,7 @@ class Client(_ClientFactoryMixin):
     def __init__(self, credentials=None, http=None):
         if credentials is None and http is None:
             credentials = get_credentials()
-        self.connection = self._connection_class(
+        self._connection = self._connection_class(
             credentials=credentials, http=http)
 
 

packages/google-cloud-core/google/cloud/client.py

@@ -382,12 +382,12 @@ def _get_next_page_response(self):
         """
         params = self._get_query_params()
         if self._HTTP_METHOD == 'GET':
-            return self.client.connection.api_request(
+            return self.client._connection.api_request(
                 method=self._HTTP_METHOD,
                 path=self.path,
                 query_params=params)
         elif self._HTTP_METHOD == 'POST':
-            return self.client.connection.api_request(
+            return self.client._connection.api_request(
                 method=self._HTTP_METHOD,
                 path=self.path,
                 data=params)

packages/google-cloud-core/google/cloud/iterator.py

@@ -104,7 +104,7 @@ class Operation(object):
     :type client: :class:`~google.cloud.client.Client`
     :param client: The client used to poll for the status of the operation.
                    If the operation was created via JSON/HTTP, the client
-                   must own a :class:`~google.cloud.connection.Connection`
+                   must own a :class:`~google.cloud._http.Connection`
                    to send polling requests. If created via protobuf, the
                    client must have a gRPC stub in the ``_operations_stub``
                    attribute.
@@ -218,7 +218,7 @@ def _get_operation_http(self):
         :returns: The latest status of the current operation.
         """
         path = 'operations/%s' % (self.name,)
-        api_response = self.client.connection.api_request(
+        api_response = self.client._connection.api_request(
             method='GET', path=path)
         return json_format.ParseDict(
             api_response, operations_pb2.Operation())

packages/google-cloud-core/google/cloud/operation.py

@@ -19,7 +19,8 @@ class TestConnection(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.connection import Connection
+        from google.cloud._http import Connection
+
         return Connection
 
     def _make_one(self, *args, **kw):
@@ -111,7 +112,8 @@ class TestJSONConnection(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.connection import JSONConnection
+        from google.cloud._http import JSONConnection
+
         return JSONConnection
 
     def _make_one(self, *args, **kw):

…cloud-core/unit_tests/test_connection.py …ogle-cloud-core/unit_tests/test__http.pypackages/google-cloud-core/unit_tests/test_connection.py renamed to packages/google-cloud-core/unit_tests/test__http.py packages/google-cloud-core/unit_tests/test_connection.py renamed to packages/google-cloud-core/unit_tests/test__http.py

@@ -60,18 +60,18 @@ def mock_get_credentials():
         with _Monkey(client, get_credentials=mock_get_credentials):
             client_obj = self._make_one()
 
-        self.assertIsInstance(client_obj.connection, _MockConnection)
-        self.assertIs(client_obj.connection.credentials, CREDENTIALS)
+        self.assertIsInstance(client_obj._connection, _MockConnection)
+        self.assertIs(client_obj._connection.credentials, CREDENTIALS)
         self.assertEqual(FUNC_CALLS, ['get_credentials'])
 
     def test_ctor_explicit(self):
         CREDENTIALS = object()
         HTTP = object()
         client_obj = self._make_one(credentials=CREDENTIALS, http=HTTP)
 
-        self.assertIsInstance(client_obj.connection, _MockConnection)
-        self.assertIs(client_obj.connection.credentials, CREDENTIALS)
-        self.assertIs(client_obj.connection.http, HTTP)
+        self.assertIsInstance(client_obj._connection, _MockConnection)
+        self.assertIs(client_obj._connection.credentials, CREDENTIALS)
+        self.assertIs(client_obj._connection.http, HTTP)
 
     def test_from_service_account_json(self):
         from google.cloud._testing import _Monkey
@@ -83,7 +83,7 @@ def test_from_service_account_json(self):
         with _Monkey(client, ServiceAccountCredentials=mock_creds):
             client_obj = KLASS.from_service_account_json(MOCK_FILENAME)
 
-        self.assertIs(client_obj.connection.credentials, mock_creds._result)
+        self.assertIs(client_obj._connection.credentials, mock_creds._result)
         self.assertEqual(mock_creds.json_called, [MOCK_FILENAME])
 
     def test_from_service_account_json_fail(self):
@@ -104,7 +104,7 @@ def test_from_service_account_p12(self):
             client_obj = KLASS.from_service_account_p12(CLIENT_EMAIL,
                                                         MOCK_FILENAME)
 
-        self.assertIs(client_obj.connection.credentials, mock_creds._result)
+        self.assertIs(client_obj._connection.credentials, mock_creds._result)
         self.assertEqual(mock_creds.p12_called,
                          [(CLIENT_EMAIL, MOCK_FILENAME)])
 
@@ -155,8 +155,8 @@ def mock_get_credentials():
             client_obj = self._make_one()
 
         self.assertEqual(client_obj.project, PROJECT)
-        self.assertIsInstance(client_obj.connection, _MockConnection)
-        self.assertIs(client_obj.connection.credentials, CREDENTIALS)
+        self.assertIsInstance(client_obj._connection, _MockConnection)
+        self.assertIs(client_obj._connection.credentials, CREDENTIALS)
         self.assertEqual(
             FUNC_CALLS,
             [(None, '_determine_default_project'), 'get_credentials'])
@@ -196,9 +196,9 @@ def _explicit_ctor_helper(self, project):
             self.assertEqual(client_obj.project, project.decode('utf-8'))
         else:
             self.assertEqual(client_obj.project, project)
-        self.assertIsInstance(client_obj.connection, _MockConnection)
-        self.assertIs(client_obj.connection.credentials, CREDENTIALS)
-        self.assertIs(client_obj.connection.http, HTTP)
+        self.assertIsInstance(client_obj._connection, _MockConnection)
+        self.assertIs(client_obj._connection.credentials, CREDENTIALS)
+        self.assertIs(client_obj._connection.http, HTTP)
 
     def test_ctor_explicit_bytes(self):
         PROJECT = b'PROJECT'

packages/google-cloud-core/unit_tests/test_client.py

@@ -591,7 +591,7 @@ def api_request(self, **kw):
 class _Client(object):
 
     def __init__(self, connection):
-        self.connection = connection
+        self._connection = connection
 
 
 class SimpleIter(object):

packages/google-cloud-core/unit_tests/test_iterator.py

@@ -419,4 +419,4 @@ class _Client(object):
 
     def __init__(self, connection=None):
         self._operations_stub = _OperationsStub()
-        self.connection = connection
+        self._connection = connection