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

dhermes · web-flow · commit e9ff5eb14699 · 2017-02-16T18:47:41.000-08:00
Renaming all remaining connection.py modules as _http.py.
diff --git a/packages/google-cloud-language/google/cloud/language/_http.py b/packages/google-cloud-language/google/cloud/language/_http.py
diff --git a/packages/google-cloud-language/google/cloud/language/client.py b/packages/google-cloud-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/packages/google-cloud-language/unit_tests/test__http.py b/packages/google-cloud-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/packages/google-cloud-language/unit_tests/test_client.py b/packages/google-cloud-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/packages/google-cloud-language/unit_tests/test_document.py b/packages/google-cloud-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)
