Upgrade python googleapiclient

grant · grant · commit dc330620c9c2 · 2018-08-02T17:48:45.000-07:00
diff --git a/.pylintrc b/.pylintrc
@@ -426,4 +426,6 @@ max-public-methods=50
 overgeneral-exceptions=Exception
 
 # Python 2/3 compatibility
-disable=useless-object-inheritance
+disable=useless-object-inheritance
+
+redefining-builtins-modules=oauth2client # Allow oauth2client to redefine file
diff --git a/admin_sdk/directory/quickstart.py b/admin_sdk/directory/quickstart.py
@@ -18,13 +18,13 @@
 domain.
 """
 from __future__ import print_function
-from apiclient.discovery import build
+from googleapiclient.discovery import build
 from httplib2 import Http
-from oauth2client import file as oauth_file, client, tools
+from oauth2client import file, client, tools
 
 # Setup the Admin SDK Directory API
 SCOPES = 'https://www.googleapis.com/auth/admin.directory.user'
-store = oauth_file.Storage('token.json')
+store = file.Storage('token.json')
 creds = store.get()
 if not creds or creds.invalid:
     flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
diff --git a/admin_sdk/reports/quickstart.py b/admin_sdk/reports/quickstart.py
@@ -18,13 +18,13 @@
 events.
 """
 from __future__ import print_function
-from apiclient.discovery import build
+from googleapiclient.discovery import build
 from httplib2 import Http
-from oauth2client import file as oauth_file, client, tools
+from oauth2client import file, client, tools
 
 # Setup the Admin SDK Reports API
 SCOPES = 'https://www.googleapis.com/auth/admin.reports.audit.readonly'
-store = oauth_file.Storage('token.json')
+store = file.Storage('token.json')
 creds = store.get()
 if not creds or creds.invalid:
     flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
diff --git a/admin_sdk/reseller/quickstart.py b/admin_sdk/reseller/quickstart.py
@@ -18,13 +18,13 @@
 events.
 """
 from __future__ import print_function
-from apiclient.discovery import build
+from googleapiclient.discovery import build
 from httplib2 import Http
-from oauth2client import file as oauth_file, client, tools
+from oauth2client import file, client, tools
 
 # Setup the Admin SDK Reports API
 SCOPES = 'https://www.googleapis.com/auth/admin.reports.audit.readonly'
-store = oauth_file.Storage('token.json')
+store = file.Storage('token.json')
 creds = store.get()
 if not creds or creds.invalid:
     flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
diff --git a/apps_script/quickstart/quickstart.py b/apps_script/quickstart/quickstart.py
@@ -20,13 +20,13 @@
 """
 from __future__ import print_function
 from apiclient import errors
-from apiclient.discovery import build
+from googleapiclient.discovery import build
 from httplib2 import Http
-from oauth2client import file as oauthfile, client, tools
+from oauth2client import file, client, tools
 
 # Setup the Apps Script API
 SCOPES = 'https://www.googleapis.com/auth/script.projects'
-store = oauthfile.Storage('token.json')
+store = file.Storage('token.json')
 creds = store.get()
 if not creds or creds.invalid:
     flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
diff --git a/calendar/quickstart/quickstart.py b/calendar/quickstart/quickstart.py
@@ -19,13 +19,13 @@
 """
 from __future__ import print_function
 import datetime
-from apiclient.discovery import build
+from googleapiclient.discovery import build
 from httplib2 import Http
-from oauth2client import file as oauth_file, client, tools
+from oauth2client import file, client, tools
 
 # Setup the Calendar API
 SCOPES = 'https://www.googleapis.com/auth/calendar.readonly'
-store = oauth_file.Storage('token.json')
+store = file.Storage('token.json')
 creds = store.get()
 if not creds or creds.invalid:
     flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
diff --git a/classroom/quickstart/quickstart.py b/classroom/quickstart/quickstart.py
@@ -20,13 +20,13 @@
 10 courses the user has access to.
 """
 from __future__ import print_function
-from apiclient.discovery import build
+from googleapiclient.discovery import build
 from httplib2 import Http
-from oauth2client import file as oauth_file, client, tools
+from oauth2client import file, client, tools
 
 # Setup the Classroom API
 SCOPES = 'https://www.googleapis.com/auth/classroom.courses.readonly'
-store = oauth_file.Storage('token.json')
+store = file.Storage('token.json')
 creds = store.get()
 if not creds or creds.invalid:
     flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
diff --git a/drive/activity/quickstart.py b/drive/activity/quickstart.py
@@ -15,16 +15,16 @@
 # [START drive_activity_quickstart]
 from __future__ import print_function
 import datetime
-from apiclient.discovery import build
+from googleapiclient.discovery import build
 from httplib2 import Http
-from oauth2client import file as oauth_file, client, tools
+from oauth2client import file, client, tools
 
 # Setup the Drive Activity API
 SCOPES = [
     'https://www.googleapis.com/auth/activity',
     'https://www.googleapis.com/auth/drive.metadata.readonly'
 ]
-store = oauth_file.Storage('token.json')
+store = file.Storage('token.json')
 creds = store.get()
 if not creds or creds.invalid:
     flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
diff --git a/drive/quickstart/quickstart.py b/drive/quickstart/quickstart.py
@@ -20,13 +20,13 @@
 the user has access to.
 """
 from __future__ import print_function
-from apiclient.discovery import build
+from googleapiclient.discovery import build
 from httplib2 import Http
-from oauth2client import file as oauth_file, client, tools
+from oauth2client import file, client, tools
 
 # Setup the Drive v3 API
 SCOPES = 'https://www.googleapis.com/auth/drive.metadata.readonly'
-store = oauth_file.Storage('token.json')
+store = file.Storage('token.json')
 creds = store.get()
 if not creds or creds.invalid:
     flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
diff --git a/gmail/quickstart/quickstart.py b/gmail/quickstart/quickstart.py
@@ -19,13 +19,13 @@
 Lists the user's Gmail labels.
 """
 from __future__ import print_function
-from apiclient.discovery import build
+from googleapiclient.discovery import build
 from httplib2 import Http
-from oauth2client import file as oauth_file, client, tools
+from oauth2client import file, client, tools
 
 # Setup the Gmail API
 SCOPES = 'https://www.googleapis.com/auth/gmail.readonly'
-store = oauth_file.Storage('token.json')
+store = file.Storage('token.json')
 creds = store.get()
 if not creds or creds.invalid:
     flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
diff --git a/people/quickstart/quickstart.py b/people/quickstart/quickstart.py
@@ -17,13 +17,13 @@
 Shows basic usage of the People API. Outputs the name 10 connections.
 """
 from __future__ import print_function
-from apiclient.discovery import build
+from googleapiclient.discovery import build
 from httplib2 import Http
-from oauth2client import file as oauth_file, client, tools
+from oauth2client import file, client, tools
 
 # Setup the People API
 SCOPES = 'https://www.googleapis.com/auth/contacts.readonly'
-store = oauth_file.Storage('token.json')
+store = file.Storage('token.json')
 creds = store.get()
 if not creds or creds.invalid:
     flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
diff --git a/sheets/quickstart/quickstart.py b/sheets/quickstart/quickstart.py
@@ -17,13 +17,13 @@
 Shows basic usage of the Sheets API. Prints values from a Google Spreadsheet.
 """
 from __future__ import print_function
-from apiclient.discovery import build
+from googleapiclient.discovery import build
 from httplib2 import Http
-from oauth2client import file as oauth_file, client, tools
+from oauth2client import file, client, tools
 
 # Setup the Sheets API
 SCOPES = 'https://www.googleapis.com/auth/spreadsheets.readonly'
-store = oauth_file.Storage('token.json')
+store = file.Storage('token.json')
 creds = store.get()
 if not creds or creds.invalid:
     flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
diff --git a/slides/quickstart/quickstart.py b/slides/quickstart/quickstart.py
@@ -18,13 +18,13 @@
 a presentation.
 """
 from __future__ import print_function
-from apiclient.discovery import build
+from googleapiclient.discovery import build
 from httplib2 import Http
-from oauth2client import file as oauth_file, client, tools
+from oauth2client import file, client, tools
 
 # Setup the Slides API
 SCOPES = 'https://www.googleapis.com/auth/presentations.readonly'
-store = oauth_file.Storage('token.json')
+store = file.Storage('token.json')
 creds = store.get()
 if not creds or creds.invalid:
     flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
diff --git a/tasks/quickstart/quickstart.py b/tasks/quickstart/quickstart.py
@@ -17,13 +17,13 @@
 Shows basic usage of the Tasks API. Outputs the first 10 task lists.
 """
 from __future__ import print_function
-from apiclient.discovery import build
+from googleapiclient.discovery import build
 from httplib2 import Http
-from oauth2client import file as oauthfile, client, tools
+from oauth2client import file, client, tools
 
 # Setup the Tasks API
 SCOPES = 'https://www.googleapis.com/auth/tasks.readonly'
-store = oauthfile.Storage('token.json')
+store = file.Storage('token.json')
 creds = store.get()
 if not creds or creds.invalid:
     flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
diff --git a/vault/quickstart/quickstart.py b/vault/quickstart/quickstart.py
@@ -18,13 +18,13 @@
 10 matters in Vault.
 """
 from __future__ import print_function
-from apiclient.discovery import build
+from googleapiclient.discovery import build
 from httplib2 import Http
-from oauth2client import file as oauthfile, client, tools
+from oauth2client import file, client, tools
 
 # Setup the Vault API
 SCOPES = 'https://www.googleapis.com/auth/ediscovery'
-store = oauthfile.Storage('token.json')
+store = file.Storage('token.json')
 creds = store.get()
 if not creds or creds.invalid:
     flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
