Changing vision Connection to only accept client.

Author: dhermes

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:

vision/google/cloud/vision/connection.py

@@ -42,6 +42,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."""

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)