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

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

Author: dhermes

packages/google-cloud-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

packages/google-cloud-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
 

packages/google-cloud-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)

packages/google-cloud-vision/google/cloud/vision/connection.py

@@ -23,6 +23,22 @@
 B64_IMAGE_CONTENT = base64.b64encode(IMAGE_CONTENT).decode('ascii')
 
 
+class TestConnection(unittest.TestCase):
+
+    @staticmethod
+    def _get_target_class():
+        from google.cloud.vision._http import Connection
+        return Connection
+
+    def _make_one(self, *args, **kw):
+        return self._get_target_class()(*args, **kw)
+
+    def test_default_url(self):
+        client = object()
+        conn = self._make_one(client)
+        self.assertEqual(conn._client, client)
+
+
 class Test_HTTPVisionAPI(unittest.TestCase):
     def _get_target_class(self):
         from google.cloud.vision._http import _HTTPVisionAPI