Renaming all remaining connection.py modules as _http.py.

dhermes · dhermes · commit 5e2300f8029b · 2017-02-16T16:10:52.000-08:00
diff --git a/dns/google/cloud/dns/__init__.py b/dns/google/cloud/dns/__init__.py
@@ -27,7 +27,6 @@
 
 from google.cloud.dns.zone import Changes
 from google.cloud.dns.client import Client
-from google.cloud.dns.connection import Connection
 from google.cloud.dns.zone import ManagedZone
 from google.cloud.dns.resource_record_set import ResourceRecordSet
 
diff --git a/dns/google/cloud/dns/_http.py b/dns/google/cloud/dns/_http.py
diff --git a/dns/google/cloud/dns/client.py b/dns/google/cloud/dns/client.py
@@ -16,7 +16,8 @@
 
 
 from google.cloud.client import ClientWithProject
-from google.cloud.dns.connection import Connection
+
+from google.cloud.dns._http import Connection
 from google.cloud.dns.zone import ManagedZone
 from google.cloud.iterator import HTTPIterator
 
diff --git a/dns/unit_tests/test__http.py b/dns/unit_tests/test__http.py
@@ -19,7 +19,7 @@ class TestConnection(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.dns.connection import Connection
+        from google.cloud.dns._http import Connection
 
         return Connection
 
diff --git a/dns/unit_tests/test_client.py b/dns/unit_tests/test_client.py
@@ -38,7 +38,7 @@ def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
     def test_ctor(self):
-        from google.cloud.dns.connection import Connection
+        from google.cloud.dns._http import Connection
 
         creds = _make_credentials()
         http = object()
diff --git a/language/google/cloud/language/_http.py b/language/google/cloud/language/_http.py
diff --git a/language/google/cloud/language/client.py b/language/google/cloud/language/client.py
@@ -18,7 +18,8 @@
 import warnings
 
 from google.cloud import client as client_module
-from google.cloud.language.connection import Connection
+
+from google.cloud.language._http import Connection
 from google.cloud.language.document import Document
 
 
diff --git a/language/unit_tests/test__http.py b/language/unit_tests/test__http.py
@@ -19,7 +19,7 @@ class TestConnection(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.language.connection import Connection
+        from google.cloud.language._http import Connection
 
         return Connection
 
diff --git a/language/unit_tests/test_client.py b/language/unit_tests/test_client.py
@@ -36,7 +36,7 @@ def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
     def test_ctor(self):
-        from google.cloud.language.connection import Connection
+        from google.cloud.language._http import Connection
 
         creds = make_mock_credentials()
         http = object()
diff --git a/language/unit_tests/test_document.py b/language/unit_tests/test_document.py
@@ -97,7 +97,7 @@ def _get_entities(include_entities):
 
 def make_mock_client(response):
     import mock
-    from google.cloud.language.connection import Connection
+    from google.cloud.language._http import Connection
     from google.cloud.language.client import Client
 
     connection = mock.Mock(spec=Connection)
diff --git a/monitoring/google/cloud/monitoring/__init__.py b/monitoring/google/cloud/monitoring/__init__.py
@@ -15,7 +15,6 @@
 """Google Stackdriver Monitoring API wrapper."""
 
 from google.cloud.monitoring.client import Client
-from google.cloud.monitoring.connection import Connection
 from google.cloud.monitoring.group import Group
 from google.cloud.monitoring.label import LabelDescriptor
 from google.cloud.monitoring.label import LabelValueType
@@ -33,7 +32,6 @@
 
 __all__ = (
     'Client',
-    'Connection',
     'Group',
     'LabelDescriptor', 'LabelValueType',
     'Metric', 'MetricDescriptor', 'MetricKind', 'ValueType',
diff --git a/monitoring/google/cloud/monitoring/_http.py b/monitoring/google/cloud/monitoring/_http.py
diff --git a/monitoring/google/cloud/monitoring/client.py b/monitoring/google/cloud/monitoring/client.py
@@ -32,7 +32,8 @@
 
 from google.cloud._helpers import _datetime_to_rfc3339
 from google.cloud.client import ClientWithProject
-from google.cloud.monitoring.connection import Connection
+
+from google.cloud.monitoring._http import Connection
 from google.cloud.monitoring.group import Group
 from google.cloud.monitoring.metric import Metric
 from google.cloud.monitoring.metric import MetricDescriptor
@@ -44,6 +45,7 @@
 from google.cloud.monitoring.timeseries import Point
 from google.cloud.monitoring.timeseries import TimeSeries
 
+
 _UTCNOW = datetime.datetime.utcnow  # To be replaced by tests.
 
 
diff --git a/monitoring/unit_tests/test__http.py b/monitoring/unit_tests/test__http.py
@@ -19,7 +19,7 @@ class TestConnection(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.monitoring.connection import Connection
+        from google.cloud.monitoring._http import Connection
 
         return Connection
 
diff --git a/resource_manager/google/cloud/resource_manager/__init__.py b/resource_manager/google/cloud/resource_manager/__init__.py
@@ -16,7 +16,6 @@
 
 
 from google.cloud.resource_manager.client import Client
-from google.cloud.resource_manager.connection import Connection
 from google.cloud.resource_manager.project import Project
 
 
diff --git a/resource_manager/google/cloud/resource_manager/_http.py b/resource_manager/google/cloud/resource_manager/_http.py
diff --git a/resource_manager/google/cloud/resource_manager/client.py b/resource_manager/google/cloud/resource_manager/client.py
@@ -17,7 +17,8 @@
 
 from google.cloud.client import Client as BaseClient
 from google.cloud.iterator import HTTPIterator
-from google.cloud.resource_manager.connection import Connection
+
+from google.cloud.resource_manager._http import Connection
 from google.cloud.resource_manager.project import Project
 
 
diff --git a/resource_manager/unit_tests/test__http.py b/resource_manager/unit_tests/test__http.py
@@ -19,7 +19,7 @@ class TestConnection(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.resource_manager.connection import Connection
+        from google.cloud.resource_manager._http import Connection
 
         return Connection
 
diff --git a/resource_manager/unit_tests/test_client.py b/resource_manager/unit_tests/test_client.py
@@ -35,7 +35,7 @@ def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
     def test_constructor(self):
-        from google.cloud.resource_manager.connection import Connection
+        from google.cloud.resource_manager._http import Connection
 
         http = object()
         credentials = _make_credentials()
diff --git a/runtimeconfig/google/cloud/runtimeconfig/_http.py b/runtimeconfig/google/cloud/runtimeconfig/_http.py
diff --git a/runtimeconfig/google/cloud/runtimeconfig/client.py b/runtimeconfig/google/cloud/runtimeconfig/client.py
@@ -16,7 +16,8 @@
 
 
 from google.cloud.client import ClientWithProject
-from google.cloud.runtimeconfig.connection import Connection
+
+from google.cloud.runtimeconfig._http import Connection
 from google.cloud.runtimeconfig.config import Config
 
 
diff --git a/runtimeconfig/unit_tests/test__http.py b/runtimeconfig/unit_tests/test__http.py
@@ -19,7 +19,7 @@ class TestConnection(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.runtimeconfig.connection import Connection
+        from google.cloud.runtimeconfig._http import Connection
 
         return Connection
 
diff --git a/speech/google/cloud/speech/__init__.py b/speech/google/cloud/speech/__init__.py
@@ -16,6 +16,5 @@
 
 from google.cloud.speech.alternative import Alternative
 from google.cloud.speech.client import Client
-from google.cloud.speech.connection import Connection
 from google.cloud.speech.encoding import Encoding
 from google.cloud.speech.operation import Operation
diff --git a/speech/google/cloud/speech/_http.py b/speech/google/cloud/speech/_http.py
@@ -18,11 +18,29 @@
 
 from google.cloud._helpers import _bytes_to_unicode
 from google.cloud._helpers import _to_bytes
+from google.cloud import _http
 
 from google.cloud.speech.result import Result
 from google.cloud.speech.operation import Operation
 
 
+class Connection(_http.JSONConnection):
+    """A connection to Google Cloud Speech JSON REST API.
+
+    :type client: :class:`~google.cloud.speech.client.Client`
+    :param client: The client that owns the current connection.
+    """
+
+    API_BASE_URL = 'https://speech.googleapis.com'
+    """The base of the API call URL."""
+
+    API_VERSION = 'v1beta1'
+    """The version of the API, used in building the API call's URL."""
+
+    API_URL_TEMPLATE = '{api_base_url}/{api_version}/{path}'
+    """A template for the URL of a particular API call."""
+
+
 class HTTPSpeechAPI(object):
     """Speech API for interacting with the HTTP version of the API.
 
diff --git a/speech/google/cloud/speech/client.py b/speech/google/cloud/speech/client.py
@@ -20,8 +20,8 @@
 from google.cloud.environment_vars import DISABLE_GRPC
 
 from google.cloud.speech._gax import GAPICSpeechAPI
+from google.cloud.speech._http import Connection
 from google.cloud.speech._http import HTTPSpeechAPI
-from google.cloud.speech.connection import Connection
 from google.cloud.speech.sample import Sample
 
 
diff --git a/speech/google/cloud/speech/connection.py b/speech/google/cloud/speech/connection.py
diff --git a/speech/unit_tests/test__http.py b/speech/unit_tests/test__http.py
@@ -19,7 +19,7 @@ class TestConnection(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.speech.connection import Connection
+        from google.cloud.speech._http import Connection
 
         return Connection
 
diff --git a/speech/unit_tests/test_client.py b/speech/unit_tests/test_client.py
@@ -85,7 +85,7 @@ def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
     def test_ctor(self):
-        from google.cloud.speech.connection import Connection
+        from google.cloud.speech._http import Connection
 
         creds = _make_credentials()
         http = object()
diff --git a/translate/google/cloud/translate/__init__.py b/translate/google/cloud/translate/__init__.py
@@ -17,4 +17,3 @@
 from google.cloud.translate.client import BASE
 from google.cloud.translate.client import Client
 from google.cloud.translate.client import NMT
-from google.cloud.translate.connection import Connection
diff --git a/translate/google/cloud/translate/_http.py b/translate/google/cloud/translate/_http.py
diff --git a/translate/google/cloud/translate/client.py b/translate/google/cloud/translate/client.py
@@ -19,7 +19,8 @@
 
 from google.cloud._helpers import _to_bytes
 from google.cloud.client import Client as BaseClient
-from google.cloud.translate.connection import Connection
+
+from google.cloud.translate._http import Connection
 
 
 ENGLISH_ISO_639 = 'en'
diff --git a/translate/unit_tests/test__http.py b/translate/unit_tests/test__http.py
@@ -19,7 +19,7 @@ class TestConnection(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.translate.connection import Connection
+        from google.cloud.translate._http import Connection
 
         return Connection
 
diff --git a/translate/unit_tests/test_client.py b/translate/unit_tests/test_client.py
@@ -27,7 +27,7 @@ def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
     def test_constructor(self):
-        from google.cloud.translate.connection import Connection
+        from google.cloud.translate._http import Connection
         from google.cloud.translate.client import ENGLISH_ISO_639
 
         http = object()
@@ -38,7 +38,7 @@ def test_constructor(self):
         self.assertEqual(client.target_language, ENGLISH_ISO_639)
 
     def test_constructor_non_default(self):
-        from google.cloud.translate.connection import Connection
+        from google.cloud.translate._http import Connection
 
         http = object()
         target = 'es'
diff --git a/vision/google/cloud/vision/__init__.py b/vision/google/cloud/vision/__init__.py
@@ -13,4 +13,5 @@
 # limitations under the License.
 
 """Google Cloud Vision API package."""
+
 from google.cloud.vision.client import Client
diff --git a/vision/google/cloud/vision/_http.py b/vision/google/cloud/vision/_http.py
@@ -14,10 +14,29 @@
 
 """HTTP Client for interacting with the Google Cloud Vision API."""
 
+from google.cloud import _http
+
 from google.cloud.vision.annotations import Annotations
 from google.cloud.vision.feature import Feature
 
 
+class Connection(_http.JSONConnection):
+    """A connection to Google Cloud Vision via the JSON REST API.
+
+    :type client: :class:`~google.cloud.vision.client.Client`
+    :param client: The client that owns the current connection.
+    """
+
+    API_BASE_URL = 'https://vision.googleapis.com'
+    """The base of the API call URL."""
+
+    API_VERSION = 'v1'
+    """The version of the API, used in building the API call's URL."""
+
+    API_URL_TEMPLATE = '{api_base_url}/{api_version}{path}'
+    """A template for the URL of a particular API call."""
+
+
 class _HTTPVisionAPI(object):
     """Vision API for interacting with the JSON/HTTP version of Vision
 
diff --git a/vision/google/cloud/vision/client.py b/vision/google/cloud/vision/client.py
@@ -20,10 +20,10 @@
 from google.cloud.environment_vars import DISABLE_GRPC
 
 from google.cloud.vision._gax import _GAPICVisionAPI
+from google.cloud.vision._http import _HTTPVisionAPI
+from google.cloud.vision._http import Connection
 from google.cloud.vision.batch import Batch
-from google.cloud.vision.connection import Connection
 from google.cloud.vision.image import Image
-from google.cloud.vision._http import _HTTPVisionAPI
 
 
 _USE_GAX = not os.getenv(DISABLE_GRPC, False)
diff --git a/vision/google/cloud/vision/connection.py b/vision/google/cloud/vision/connection.py
diff --git a/vision/unit_tests/test__http.py b/vision/unit_tests/test__http.py
diff --git a/vision/unit_tests/test_connection.py b/vision/unit_tests/test_connection.py

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`
`17`	`17`
`18`	`18`	`from google.cloud.resource_manager.client import Client`
`19`		`-from google.cloud.resource_manager.connection import Connection`
`20`	`19`	`from google.cloud.resource_manager.project import Project`
`21`	`20`
`22`	`21`