Merge pull request #2970 from dhermes/cnxn-client-hygiene

Making Connection()-s act as proxies for data stored in Client()-s

Author: dhermes

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

@@ -55,14 +55,17 @@ class Client(ClientWithProject):
                     falls back to the ``GOOGLE_CLOUD_DISABLE_GRPC`` environment
                     variable
     """
+
+    SCOPE = ('https://www.googleapis.com/auth/cloud-platform',)
+    """The scopes required for authenticating as a Cloud Vision consumer."""
+
     _vision_api_internal = None
 
     def __init__(self, project=None, credentials=None, http=None,
                  use_gax=None):
         super(Client, self).__init__(
             project=project, credentials=credentials, http=http)
-        self._connection = Connection(
-            credentials=self._credentials, http=self._http)
+        self._connection = Connection(self)
         if use_gax is None:
             self._use_gax = _USE_GAX
         else:

packages/google-cloud-vision/google/cloud/vision/connection.py

@@ -22,16 +22,8 @@
 class Connection(_http.JSONConnection):
     """A connection to Google Cloud Vision via the JSON REST API.
 
-    :type credentials: :class:`oauth2client.client.OAuth2Credentials`
-    :param credentials: (Optional) The OAuth2 Credentials to use for this
-                        connection.
-
-    :type http: :class:`httplib2.Http` or class that defines ``request()``.
-    :param http: (Optional) HTTP object to make requests.
-
-    :type api_base_url: str
-    :param api_base_url: The base of the API call URL. Defaults to the value
-                         :attr:`Connection.API_BASE_URL`.
+    :type client: :class:`~google.cloud.vision.client.Client`
+    :param client: The client that owns the current connection.
     """
 
     API_BASE_URL = 'https://vision.googleapis.com'
@@ -42,6 +34,3 @@ class Connection(_http.JSONConnection):
 
     API_URL_TEMPLATE = '{api_base_url}/{api_version}{path}'
     """A template for the URL of a particular API call."""
-
-    SCOPE = ('https://www.googleapis.com/auth/cloud-platform',)
-    """The scopes required for authenticating as a Cloud Vision consumer."""

packages/google-cloud-vision/unit_tests/test_connection.py

@@ -26,6 +26,6 @@ def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
     def test_default_url(self):
-        creds = object()
-        conn = self._make_one(creds)
-        self.assertEqual(conn.credentials, creds)
+        client = object()
+        conn = self._make_one(client)
+        self.assertEqual(conn._client, client)