Import errors

Author: mhaseebtariq

pandas/io/gbq.py

@@ -54,8 +54,6 @@ def _test_google_api_imports():
             from apiclient.errors import HttpError  # noqa
         from oauth2client.client import GoogleCredentials  # noqa
         from oauth2client.client import AccessTokenRefreshError  # noqa
-        from oauth2client.client import HttpAccessTokenRefreshError  # noqa
-        from oauth2client.client import ApplicationDefaultCredentialsError  # noqa
         from oauth2client.client import OAuth2WebServerFlow  # noqa
         from oauth2client.file import Storage  # noqa
         from oauth2client.tools import run_flow, argparser  # noqa
@@ -193,18 +191,13 @@ def get_application_default_credentials(self):
         """
         try:
             from googleapiclient.discovery import build
-            from googleapiclient.errors import HttpError
         except ImportError:
             from apiclient.discovery import build
-            from apiclient.errors import HttpError
         from oauth2client.client import GoogleCredentials
-        from oauth2client.client import AccessTokenRefreshError
-        from oauth2client.client import HttpAccessTokenRefreshError
-        from oauth2client.client import ApplicationDefaultCredentialsError
 
         try:
             credentials = GoogleCredentials.get_application_default()
-        except ApplicationDefaultCredentialsError:
+        except:
             return None
 
         # Check if the application has rights to the BigQuery project
@@ -214,8 +207,7 @@ def get_application_default_credentials(self):
         try:
             jobs.insert(projectId=self.project_id, body=job_data).execute()
             return credentials
-        except (HttpAccessTokenRefreshError, AccessTokenRefreshError,
-                HttpError, TypeError):
+        except:
             return None
 
     def get_user_account_credentials(self):

pandas/io/tests/test_gbq.py

@@ -56,32 +56,6 @@ def _skip_if_no_private_key_contents():
         _skip_if_no_private_key_contents()
 
 
-def _check_if_can_get_correct_default_credentials():
-    try:
-        from oauth2client.client import GoogleCredentials
-        from apiclient.discovery import build
-        credentials = GoogleCredentials.get_application_default()
-        bigquery_service = build('bigquery', 'v2', credentials=credentials)
-        jobs = bigquery_service.jobs()
-        job_data = {'configuration': {'query': {'query': 'SELECT 1'}}}
-        jobs.insert(projectId=PROJECT_ID, body=job_data).execute()
-        return True
-    except:
-        return False
-
-
-def _skip_if_cant_get_correct_default_credentials():
-    if not _check_if_can_get_correct_default_credentials():
-        raise nose.SkipTest("Cannot get default_credentials "
-                            "from the environment!")
-
-
-def _skip_if_can_get_correct_default_credentials():
-    if _check_if_can_get_correct_default_credentials():
-        raise nose.SkipTest("Can get default_credentials "
-                            "from the environment!")
-
-
 def _test_imports():
     global _GOOGLE_API_CLIENT_INSTALLED, _GOOGLE_API_CLIENT_VALID_VERSION, \
         _HTTPLIB2_INSTALLED, _SETUPTOOLS_INSTALLED
@@ -178,6 +152,36 @@ def test_requirements():
         raise nose.SkipTest(import_exception)
 
 
+def _check_if_can_get_correct_default_credentials():
+    test_requirements()
+    from oauth2client.client import GoogleCredentials
+    try:
+        from googleapiclient.discovery import build
+    except ImportError:
+        from apiclient.discovery import build
+    try:
+        credentials = GoogleCredentials.get_application_default()
+        bigquery_service = build('bigquery', 'v2', credentials=credentials)
+        jobs = bigquery_service.jobs()
+        job_data = {'configuration': {'query': {'query': 'SELECT 1'}}}
+        jobs.insert(projectId=PROJECT_ID, body=job_data).execute()
+        return True
+    except:
+        return False
+
+
+def _skip_if_cant_get_correct_default_credentials():
+    if not _check_if_can_get_correct_default_credentials():
+        raise nose.SkipTest("Cannot get default_credentials "
+                            "from the environment!")
+
+
+def _skip_if_can_get_correct_default_credentials():
+    if _check_if_can_get_correct_default_credentials():
+        raise nose.SkipTest("Can get default_credentials "
+                            "from the environment!")
+
+
 def clean_gbq_environment(private_key=None):
     dataset = gbq._Dataset(PROJECT_ID, private_key=private_key)