Address review comments.

tswast · tswast · commit 90da90ff627a · 2017-05-18T16:39:16.000-07:00
diff --git a/ci/requirements-2.7.pip b/ci/requirements-2.7.pip
@@ -1,7 +1,7 @@
-httplib2>=0.9.1
-google-api-python-client>=1.6.2, <2.0.0dev
-google-auth>=1.0.0, <2.0.0dev
-google-auth-httplib2>=0.0.2, <2.0.0dev
-google-auth-oauthlib>=0.1.0, <2.0.0dev
+google-api-python-client
+google-auth
+google-auth-httplib2
+google-auth-oauthlib
 PyCrypto
 python-gflags==2.0
+mock
diff --git a/ci/requirements-3.4.pip b/ci/requirements-3.4.pip
@@ -1,5 +1,5 @@
-httplib2>=0.9.1
-google-api-python-client>=1.6.2, <2.0.0dev
-google-auth>=1.0.0, <2.0.0dev
-google-auth-httplib2>=0.0.2, <2.0.0dev
-google-auth-oauthlib>=0.1.0, <2.0.0dev
+google-api-python-client
+google-auth
+google-auth-httplib2
+google-auth-oauthlib
+mock
diff --git a/ci/requirements-3.5.pip b/ci/requirements-3.5.pip
@@ -1,5 +1,5 @@
-httplib2>=0.9.1
-google-api-python-client>=1.6.2, <2.0.0dev
-google-auth>=1.0.0, <2.0.0dev
-google-auth-httplib2>=0.0.2, <2.0.0dev
-google-auth-oauthlib>=0.1.0, <2.0.0dev
+google-api-python-client
+google-auth
+google-auth-httplib2
+google-auth-oauthlib
+mock
diff --git a/ci/requirements-3.6.pip b/ci/requirements-3.6.pip
@@ -1,5 +1,5 @@
-httplib2>=0.9.1
-google-api-python-client>=1.6.2, <2.0.0dev
-google-auth>=1.0.0, <2.0.0dev
-google-auth-httplib2>=0.0.2, <2.0.0dev
-google-auth-oauthlib>=0.1.0, <2.0.0dev
+google-api-python-client
+google-auth
+google-auth-httplib2
+google-auth-oauthlib
+mock
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -4,7 +4,7 @@ Changelog
 0.1.7 / 2017-??-??
 ------------------
 
-- Use the `google-auth <https://google-auth.readthedocs.io/en/latest/>`__ library for authentication because oauth2client is deprecated. :issue:`37`
+- Use the `google-auth <https://google-auth.readthedocs.io/en/latest/>`__ library for authentication because oauth2client is deprecated. (:issue:`39`)
 - ``read_gbq`` now has a ``auth_local_webserver`` boolean argument for controlling whether to use web server or console flow when getting user credentials.
 
 0.1.6 / 2017-05-03
diff --git a/pandas_gbq/gbq.py b/pandas_gbq/gbq.py
@@ -6,19 +6,73 @@
 import time
 import sys
 
-import google.auth
-import google.oauth2.credentials
-from google.oauth2 import service_account
-import google_auth_httplib2
-from google_auth_oauthlib import flow
-import httplib2
 import numpy as np
 
 from distutils.version import StrictVersion
 from pandas import compat, DataFrame, concat
 from pandas.compat import lzip, bytes_to_str
 
 
+def _check_google_client_version():
+
+    try:
+        import pkg_resources
+
+    except ImportError:
+        raise ImportError('Could not import pkg_resources (setuptools).')
+
+    # Version 1.6.0 is the first version to support google-auth.
+    # https://github.com/google/google-api-python-client/blob/master/CHANGELOG
+    google_api_minimum_version = '1.6.0'
+
+    _GOOGLE_API_CLIENT_VERSION = pkg_resources.get_distribution(
+        'google-api-python-client').version
+
+    if (StrictVersion(_GOOGLE_API_CLIENT_VERSION) <
+            StrictVersion(google_api_minimum_version)):
+        raise ImportError("pandas requires google-api-python-client >= {0} "
+                          "for Google BigQuery support, "
+                          "current version {1}"
+                          .format(google_api_minimum_version,
+                                  _GOOGLE_API_CLIENT_VERSION))
+
+
+def _test_google_api_imports():
+
+    try:
+        import httplib2  # noqa
+        from googleapiclient.discovery import build  # noqa
+        from googleapiclient.errors import HttpError  # noqa
+        import google.auth #noqa
+        from google_auth_oauthlib.flow import InstalledAppFlow #noqa
+        import google_auth_httplib2 #noqa
+    except ImportError as e:
+        raise ImportError("Missing module required for Google BigQuery "
+                          "support: {0}".format(str(e)))
+
+
+def _try_credentials(project_id, credentials):
+    import httplib2
+    from googleapiclient.discovery import build
+    import googleapiclient.errors
+    from google_auth_httplib2 import AuthorizedHttp
+
+    if credentials is None:
+        return None
+
+    http = httplib2.Http()
+    try:
+        http = AuthorizedHttp(credentials, http=http)
+        bigquery_service = build('bigquery', 'v2', http=http)
+        # Check if the application has rights to the BigQuery project
+        jobs = bigquery_service.jobs()
+        job_data = {'configuration': {'query': {'query': 'SELECT 1'}}}
+        jobs.insert(projectId=project_id, body=job_data).execute()
+        return credentials
+    except googleapiclient.errors.Error:
+        return None
+
+
 class InvalidPrivateKeyFormat(ValueError):
     """
     Raised when provided private key has invalid format.
@@ -109,7 +163,7 @@ class GbqConnector(object):
     scope = 'https://www.googleapis.com/auth/bigquery'
 
     def __init__(self, project_id, reauth=False, verbose=False,
-                 private_key=None, auth_local_webserver=True,
+                 private_key=None, auth_local_webserver=False,
                  dialect='legacy'):
         self.project_id = project_id
         self.reauth = reauth
@@ -120,7 +174,7 @@ def __init__(self, project_id, reauth=False, verbose=False,
             auth_local_webserver=auth_local_webserver)
         self.service = self.get_service()
 
-    def get_credentials(self, auth_local_webserver=True):
+    def get_credentials(self, auth_local_webserver=False):
         if self.private_key:
             return self.get_service_account_credentials()
         else:
@@ -131,27 +185,6 @@ def get_credentials(self, auth_local_webserver=True):
                     auth_local_webserver=auth_local_webserver)
             return credentials
 
-    def try_credentials(self, credentials):
-        try:
-            from googleapiclient.discovery import build
-        except:
-            from apiclient.discovery import build
-
-        if credentials is None:
-            return None
-
-        http = httplib2.Http()
-        try:
-            http = google_auth_httplib2.AuthorizedHttp(credentials, http=http)
-            bigquery_service = build('bigquery', 'v2', http=http)
-            # Check if the application has rights to the BigQuery project
-            jobs = bigquery_service.jobs()
-            job_data = {'configuration': {'query': {'query': 'SELECT 1'}}}
-            jobs.insert(projectId=self.project_id, body=job_data).execute()
-            return credentials
-        except:
-            return None
-
     def get_application_default_credentials(self):
         """
         This method tries to retrieve the "default application credentials".
@@ -172,8 +205,15 @@ def get_application_default_credentials(self):
             from the environment. Or, the retrieved credentials do not
             have access to the project (self.project_id) on BigQuery.
         """
-        credentials, _ = google.auth.default(scopes=[self.scope])
-        return self.try_credentials(credentials)
+        import google.auth
+        from google.auth.exceptions import DefaultCredentialsError
+
+        try:
+            credentials, _ = google.auth.default(scopes=[self.scope])
+        except DefaultCredentialsError:
+            return None
+
+        return _try_credentials(self.project_id, credentials)
 
     def load_user_account_credentials(self):
         """
@@ -193,55 +233,68 @@ def load_user_account_credentials(self):
             credentials do not have access to the project (self.project_id)
             on BigQuery.
         """
-        with open('bigquery_credentials.dat') as credentials_file:
-            credentials_json = json.load(credentials_file)
-            credentials = google.oauth2.credentials.Credentials(
-                token=credentials_json.get('access_token'),
-                refresh_token=credentials_json.get('refresh_token'),
-                id_token=credentials_json.get('id_token'),
-                token_uri=credentials_json.get('token_uri'),
-                client_id=credentials_json.get('client_id'),
-                client_secret=credentials_json.get('client_secret'),
-                scopes=credentials_json.get('scopes'))
+        import httplib2
+        from google_auth_httplib2 import Request
+        from google.oauth2.credentials import Credentials
 
-            # Refresh the token before trying to use it.
-            http = httplib2.Http()
-            request = google_auth_httplib2.Request(http)
-            credentials.refresh(request)
+        try:
+            with open('bigquery_credentials.dat') as credentials_file:
+                credentials_json = json.load(credentials_file)
+        except (IOError, ValueError):
+            return None
+
+        credentials = Credentials(
+            token=credentials_json.get('access_token'),
+            refresh_token=credentials_json.get('refresh_token'),
+            id_token=credentials_json.get('id_token'),
+            token_uri=credentials_json.get('token_uri'),
+            client_id=credentials_json.get('client_id'),
+            client_secret=credentials_json.get('client_secret'),
+            scopes=credentials_json.get('scopes'))
 
-        return self.try_credentials(credentials)
+        # Refresh the token before trying to use it.
+        http = httplib2.Http()
+        request = Request(http)
+        credentials.refresh(request)
+
+        return _try_credentials(self.project_id, credentials)
 
     def save_user_account_credentials(self, credentials):
         """
         Saves user account credentials to a local file.
         """
-        with open('bigquery_credentials.dat', 'wb') as credentials_file:
-            credentials_json = {
-                'refresh_token': credentials.refresh_token,
-                'id_token': credentials.id_token,
-                'token_uri': credentials.token_uri,
-                'client_id': credentials.client_id,
-                'client_secret': credentials.client_secret,
-                'scopes': credentials.scopes,
-            }
-            json.dump(credentials_file, credentials_json)
-
-    def get_user_account_credentials(self, auth_local_webserver=True):
+        try:
+            with open('bigquery_credentials.dat', 'w') as credentials_file:
+                credentials_json = {
+                    'refresh_token': credentials.refresh_token,
+                    'id_token': credentials.id_token,
+                    'token_uri': credentials.token_uri,
+                    'client_id': credentials.client_id,
+                    'client_secret': credentials.client_secret,
+                    'scopes': credentials.scopes,
+                }
+                json.dump(credentials_json, credentials_file)
+        except IOError:
+            self._print('Unable to save credentials.')
+
+    def get_user_account_credentials(self, auth_local_webserver=False):
         """Gets user account credentials.
 
         This method authenticates using user credentials, either loading saved
         credentials from a file or by going through the OAuth flow.
 
         Parameters
         ----------
-        auth_local_webserver : boolean (default True)
+        auth_local_webserver : boolean (default False)
             Use a local webserver to complete the OAuth flow.
 
         Returns
         -------
         GoogleCredentials : credentials
             Credentials for the user with BigQuery access.
         """
+        from google_auth_oauthlib.flow import InstalledAppFlow
+
         credentials = self.load_user_account_credentials()
 
         client_config = {
@@ -256,7 +309,7 @@ def get_user_account_credentials(self, auth_local_webserver=True):
         }
 
         if credentials is None or self.reauth:
-            app_flow = flow.InstalledAppFlow.from_client_config(
+            app_flow = InstalledAppFlow.from_client_config(
                 client_config, scopes=[self.scope])
 
             if auth_local_webserver:
@@ -269,6 +322,9 @@ def get_user_account_credentials(self, auth_local_webserver=True):
         return credentials
 
     def get_service_account_credentials(self):
+        import httplib2
+        from google_auth_httplib2 import Request
+        from google.oauth2.service_account import Credentials
         from os.path import isfile
 
         try:
@@ -286,13 +342,12 @@ def get_service_account_credentials(self):
                 json_key['private_key'] = bytes(
                     json_key['private_key'], 'UTF-8')
 
-            credentials = service_account.Credentials.from_service_account_info(
-                json_key)
+            credentials = Credentials.from_service_account_info(json_key)
             credentials = credentials.with_scopes([self.scope])
 
             # Refresh the token before trying to use it.
             http = httplib2.Http()
-            request = google_auth_httplib2.Request(http)
+            request = Request(http)
             credentials.refresh(request)
 
             return credentials
@@ -333,13 +388,11 @@ def sizeof_fmt(num, suffix='B'):
 
     def get_service(self):
         import httplib2
-        try:
-            from googleapiclient.discovery import build
-        except:
-            from apiclient.discovery import build
+        from google_auth_httplib2 import AuthorizedHttp
+        from googleapiclient.discovery import build
 
         http = httplib2.Http()
-        http = google_auth_httplib2.AuthorizedHttp(
+        http = AuthorizedHttp(
             self.credentials, http=http)
         bigquery_service = build('bigquery', 'v2', http=http)
 
@@ -650,7 +703,7 @@ def _parse_entry(field_value, field_type):
 
 def read_gbq(query, project_id=None, index_col=None, col_order=None,
              reauth=False, verbose=True, private_key=None,
-             auth_local_webserver=True, dialect='legacy', **kwargs):
+             auth_local_webserver=False, dialect='legacy', **kwargs):
     r"""Load data from Google BigQuery.
 
     The main method a user calls to execute a Query in Google BigQuery
@@ -694,7 +747,7 @@ def read_gbq(query, project_id=None, index_col=None, col_order=None,
         Service account private key in JSON format. Can be file path
         or string contents. This is useful for remote server
         authentication (eg. jupyter iPython notebook on remote host)
-    auth_local_webserver : boolean (default True)
+    auth_local_webserver : boolean (default False)
         Use a local webserver when getting user credentials to handle
         OAuth authorization flow redirects.
 
@@ -779,7 +832,8 @@ def read_gbq(query, project_id=None, index_col=None, col_order=None,
 
 
 def to_gbq(dataframe, destination_table, project_id, chunksize=10000,
-           verbose=True, reauth=False, if_exists='fail', private_key=None):
+           verbose=True, reauth=False, if_exists='fail', private_key=None,
+           auth_local_webserver=False):
     """Write a DataFrame to a Google BigQuery table.
 
     The main method a user calls to export pandas DataFrame contents to
@@ -826,6 +880,9 @@ def to_gbq(dataframe, destination_table, project_id, chunksize=10000,
         Service account private key in JSON format. Can be file path
         or string contents. This is useful for remote server
         authentication (eg. jupyter iPython notebook on remote host)
+    auth_local_webserver : boolean (default False)
+        Use a local webserver when getting user credentials to handle
+        OAuth authorization flow redirects.
     """
 
     if if_exists not in ('fail', 'replace', 'append'):
@@ -835,8 +892,9 @@ def to_gbq(dataframe, destination_table, project_id, chunksize=10000,
         raise NotFoundException(
             "Invalid Table Name. Should be of the form 'datasetId.tableId' ")
 
-    connector = GbqConnector(project_id, reauth=reauth, verbose=verbose,
-                             private_key=private_key)
+    connector = GbqConnector(
+        project_id, reauth=reauth, verbose=verbose, private_key=private_key,
+        auth_local_webserver=auth_local_webserver)
     dataset_id, table_id = destination_table.rsplit('.', 1)
 
     table = _Table(project_id, dataset_id, reauth=reauth,
diff --git a/pandas_gbq/tests/test_gbq.py b/pandas_gbq/tests/test_gbq.py
diff --git a/setup.py b/setup.py
