Rename 'app_engine_id'/'compute_engine_id' to indicate non-APIness.

tseaver · tseaver · commit 14a7415e646b · 2015-03-20T11:37:52.000-04:00
diff --git a/gcloud/_helpers.py b/gcloud/_helpers.py
@@ -112,7 +112,7 @@ def _lazy_property_deco(deferred_callable):
     return _LazyProperty(deferred_callable.__name__, deferred_callable)
 
 
-def app_engine_id():
+def _app_engine_id():
     """Gets the App Engine application ID if it can be inferred.
 
     :rtype: string or ``NoneType``
@@ -125,7 +125,7 @@ def app_engine_id():
     return app_identity.get_application_id()
 
 
-def compute_engine_id():
+def _compute_engine_id():
     """Gets the Compute Engine project ID if it can be inferred.
 
     Uses 169.254.169.254 for the metadata server to avoid request
diff --git a/gcloud/datastore/_implicit_environ.py b/gcloud/datastore/_implicit_environ.py
@@ -19,12 +19,9 @@
 """
 
 import os
-import socket
 
-from six.moves.http_client import HTTPConnection  # pylint: disable=F0401
-
-from gcloud._helpers import app_engine_id
-from gcloud._helpers import compute_engine_id
+from gcloud._helpers import _app_engine_id
+from gcloud._helpers import _compute_engine_id
 from gcloud._helpers import _lazy_property_deco
 from gcloud import credentials
 from gcloud.datastore.connection import Connection
@@ -72,10 +69,10 @@ def _determine_default_dataset_id(dataset_id=None):
         dataset_id = _get_gcd_dataset_id()
 
     if dataset_id is None:
-        dataset_id = app_engine_id()
+        dataset_id = _app_engine_id()
 
     if dataset_id is None:
-        dataset_id = compute_engine_id()
+        dataset_id = _compute_engine_id()
 
     return dataset_id
 
diff --git a/gcloud/datastore/test__implicit_environ.py b/gcloud/datastore/test__implicit_environ.py
@@ -154,8 +154,8 @@ def gce_mock():
         patched_methods = {
             '_get_production_dataset_id': prod_mock,
             '_get_gcd_dataset_id': gcd_mock,
-            'app_engine_id': gae_mock,
-            'compute_engine_id': gce_mock,
+            '_app_engine_id': gae_mock,
+            '_compute_engine_id': gce_mock,
         }
 
         with _Monkey(_implicit_environ, **patched_methods):
diff --git a/gcloud/test__helpers.py b/gcloud/test__helpers.py
@@ -95,11 +95,11 @@ def test_func():
         self.assertEqual(lazy_prop._name, 'test_func')
 
 
-class Test_app_engine_id(unittest2.TestCase):
+class Test__app_engine_id(unittest2.TestCase):
 
     def _callFUT(self):
-        from gcloud._helpers import app_engine_id
-        return app_engine_id()
+        from gcloud._helpers import _app_engine_id
+        return _app_engine_id()
 
     def test_no_value(self):
         from gcloud._testing import _Monkey
@@ -120,11 +120,11 @@ def test_value_set(self):
             self.assertEqual(dataset_id, APP_ENGINE_ID)
 
 
-class Test_compute_engine_id(unittest2.TestCase):
+class Test__compute_engine_id(unittest2.TestCase):
 
     def _callFUT(self):
-        from gcloud._helpers import compute_engine_id
-        return compute_engine_id()
+        from gcloud._helpers import _compute_engine_id
+        return _compute_engine_id()
 
     def _monkeyConnection(self, connection):
         from gcloud._testing import _Monkey
