Changing DNS Connection to only accept client.

Author: dhermes

dns/google/cloud/dns/__init__.py

@@ -32,4 +32,4 @@
 from google.cloud.dns.resource_record_set import ResourceRecordSet
 
 
-SCOPE = Connection.SCOPE
+SCOPE = Client.SCOPE

dns/google/cloud/dns/client.py

@@ -43,11 +43,13 @@ class Client(ClientWithProject):
                  ``credentials`` for the current object.
     """
 
+    SCOPE = ('https://www.googleapis.com/auth/ndev.clouddns.readwrite',)
+    """The scopes required for authenticating as a Cloud DNS consumer."""
+
     def __init__(self, project=None, credentials=None, http=None):
         super(Client, self).__init__(
             project=project, credentials=credentials, http=http)
-        self._connection = Connection(
-            credentials=self._credentials, http=self._http)
+        self._connection = Connection(self)
 
     def quotas(self):
         """Return DNS quotas for the project associated with this client.

dns/google/cloud/dns/connection.py

@@ -28,6 +28,3 @@ class Connection(_http.JSONConnection):
 
     API_URL_TEMPLATE = '{api_base_url}/dns/{api_version}{path}'
     """A template for the URL of a particular API call."""
-
-    SCOPE = ('https://www.googleapis.com/auth/ndev.clouddns.readwrite',)
-    """The scopes required for authenticating as a Cloud DNS consumer."""

dns/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_no_extra_query_params(self):
-        conn = self._make_one()
+        conn = self._make_one(object())
         URI = '/'.join([
             conn.API_BASE_URL,
             'dns',
@@ -40,7 +40,7 @@ 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()
+        conn = self._make_one(object())
         uri = conn.build_api_url('/foo', {'bar': 'baz'})
         scheme, netloc, path, qs, _ = urlsplit(uri)
         self.assertEqual('%s://%s' % (scheme, netloc), conn.API_BASE_URL)