Merge pull request #3033 from dhermes/no-more-connection-modules

Renaming all remaining connection.py modules as _http.py.
googleapis · Feb 17, 2017 · c517b44 · c517b44
2 parents 3455b03 + 1adc08e
commit c517b44
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 38 deletions.
diff --git a/packages/google-cloud-python-speech/google/cloud/speech/__init__.py b/packages/google-cloud-python-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/packages/google-cloud-python-speech/google/cloud/speech/_http.py b/packages/google-cloud-python-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/packages/google-cloud-python-speech/google/cloud/speech/client.py b/packages/google-cloud-python-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/packages/google-cloud-python-speech/google/cloud/speech/connection.py b/packages/google-cloud-python-speech/google/cloud/speech/connection.py
diff --git a/...thon-speech/unit_tests/test_connection.py → ...ud-python-speech/unit_tests/test__http.py b/...thon-speech/unit_tests/test_connection.py → ...ud-python-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/packages/google-cloud-python-speech/unit_tests/test_client.py b/packages/google-cloud-python-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()