Merge pull request #1924 from daspecster/fix-gae-default-project-id

daspecster · web-flow · commit ad5936cc2d77 · 2016-06-28T16:19:06.000-04:00
Resolve issues with GAE and os.path.expanduser()
diff --git a/gcloud/_helpers.py b/gcloud/_helpers.py
@@ -188,12 +188,18 @@ def _default_service_project_id():
     :rtype: str or ``NoneType``
     :returns: Project-ID from default configuration file else ``None``
     """
-    full_config_path = os.path.expanduser(DEFAULT_CONFIGURATION_PATH)
+    search_paths = []
+    # Workaround for GAE not supporting pwd which is used by expanduser.
+    try:
+        search_paths.append(os.path.expanduser(DEFAULT_CONFIGURATION_PATH))
+    except ImportError:
+        pass
     win32_config_path = os.path.join(os.getenv('APPDATA', ''),
                                      'gcloud', 'configurations',
                                      'config_default')
+    search_paths.append(win32_config_path)
     config = configparser.RawConfigParser()
-    config.read([full_config_path, win32_config_path])
+    config.read(search_paths)
 
     if config.has_section('core'):
         return config.get('core', 'project')
diff --git a/gcloud/test__helpers.py b/gcloud/test__helpers.py
@@ -211,6 +211,7 @@ def callFUT(self, project_id=None):
 
         def mock_expanduser(path=''):
             if project_id and path.startswith('~'):
+                __import__('pwd')  # Simulate actual expanduser imports.
                 return self.temp_config_file
             return ''
 
@@ -221,6 +222,15 @@ def test_read_from_cli_info(self):
         project_id = self.callFUT('test-project-id')
         self.assertEqual('test-project-id', project_id)
 
+    def test_gae_without_expanduser(self):
+        import sys
+        try:
+            sys.modules['pwd'] = None  # Blocks pwd from being imported.
+            project_id = self.callFUT('test-project-id')
+            self.assertEqual(None, project_id)
+        finally:
+            del sys.modules['pwd']  # Unblocks importing of pwd.
+
     def test_info_value_not_present(self):
         project_id = self.callFUT()
         self.assertEqual(None, project_id)
