Changing language Connection to only accept client.

dhermes · dhermes · commit 725b4f0547c4 · 2017-01-26T16:30:25.000-08:00
diff --git a/language/google/cloud/language/client.py b/language/google/cloud/language/client.py
@@ -37,11 +37,13 @@ class Client(client_module.Client):
                  ``credentials`` for the current object.
     """
 
+    SCOPE = ('https://www.googleapis.com/auth/cloud-platform',)
+    """The scopes required for authenticating as an API consumer."""
+
     def __init__(self, credentials=None, http=None):
         super(Client, self).__init__(
             credentials=credentials, http=http)
-        self._connection = Connection(
-            credentials=self._credentials, http=self._http)
+        self._connection = Connection(self)
 
     def document_from_text(self, content, **kwargs):
         """Create a plain text document bound to this client.
diff --git a/language/google/cloud/language/connection.py b/language/google/cloud/language/connection.py
@@ -28,6 +28,3 @@ class Connection(_http.JSONConnection):
 
     API_URL_TEMPLATE = '{api_base_url}/{api_version}/documents:{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 an API consumer."""
diff --git a/language/unit_tests/test_connection.py b/language/unit_tests/test_connection.py
@@ -27,7 +27,7 @@ def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
     def test_build_api_url(self):
-        conn = self._make_one()
+        conn = self._make_one(object())
         uri = '/'.join([
             conn.API_BASE_URL,
             conn.API_VERSION,
