Replace all apiclient references by googleapiclient

slokhorst · slokhorst · commit 19407fca564b · 2018-08-08T21:44:44.000+02:00
This is the preferred name, according to googleapis/google-api-python-client@7547de6
diff --git a/apps_script/execute/execute.py b/apps_script/execute/execute.py
@@ -14,8 +14,8 @@
 
 # [START apps_script_api_execute]
 from __future__ import print_function
-from apiclient import errors
-from apiclient.discovery import build
+from googleapiclient import errors
+from googleapiclient.discovery import build
 from httplib2 import Http
 from oauth2client import file as oauth_file, client, tools
 
diff --git a/apps_script/quickstart/quickstart.py b/apps_script/quickstart/quickstart.py
@@ -19,7 +19,7 @@
 project, and log the script's URL to the user.
 """
 from __future__ import print_function
-from apiclient import errors
+from googleapiclient import errors
 from googleapiclient.discovery import build
 from httplib2 import Http
 from oauth2client import file, client, tools
diff --git a/drive/driveapp/main.py b/drive/driveapp/main.py
@@ -8,8 +8,8 @@
 from __future__ import print_function
 import pprint
 import httplib2
-import apiclient.discovery
-import apiclient.http
+from googleapiclient.discovery import build
+import googleapiclient.http
 import oauth2client.client
 
 # OAuth 2.0 scope that will be authorized.
@@ -38,11 +38,11 @@
 # Create an authorized Drive API client.
 http = httplib2.Http()
 credentials.authorize(http)
-drive_service = apiclient.discovery.build('drive', 'v2', http=http)
+drive_service = build('drive', 'v2', http=http)
 
 # Insert a file. Files are comprised of contents and metadata.
 # MediaFileUpload abstracts uploading file contents from a file on disk.
-media_body = apiclient.http.MediaFileUpload(
+media_body = googleapiclient.http.MediaFileUpload(
     FILENAME,
     mimetype=MIMETYPE,
     resumable=True
diff --git a/events/next18/qbr_tool.py b/events/next18/qbr_tool.py
@@ -25,9 +25,9 @@
 import argparse
 import re
 
-from apiclient.discovery import build
 import customer_data_service
 import customer_spreadsheet_reader
+from googleapiclient.discovery import build
 from httplib2 import Http
 from oauth2client import file as oauth_file, client, tools
 import presentation_reader
diff --git a/sheets/snippets/base_test.py b/sheets/snippets/base_test.py
@@ -15,9 +15,9 @@
 from __future__ import print_function
 import unittest
 import sys
-from apiclient import discovery
 from oauth2client.client import GoogleCredentials
 from googleapiclient import errors
+from googleapiclient.discovery import build
 import httplib2
 
 class BaseTest(unittest.TestCase):
@@ -26,8 +26,8 @@ def setUpClass(cls):
         cls.credentials = cls.create_credentials()
         http = cls.credentials.authorize(httplib2.Http())
         cls.credentials.refresh(http)
-        cls.service = discovery.build('sheets', 'v4', http=http)
-        cls.drive_service = discovery.build('drive', 'v3', http=http)
+        cls.service = build('sheets', 'v4', http=http)
+        cls.drive_service = build('drive', 'v3', http=http)
         # Hide STDOUT output generated by snippets.
         cls.stdout = sys.stdout
         sys.stdout = None
diff --git a/slides/snippets/base_test.py b/slides/snippets/base_test.py
@@ -16,19 +16,20 @@
 import sys
 import unittest
 import httplib2
-from apiclient import discovery
 from oauth2client.client import GoogleCredentials
 from googleapiclient import errors
+from googleapiclient.discovery import build
+
 
 class BaseTest(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.credentials = cls.create_credentials()
         http = cls.credentials.authorize(httplib2.Http())
         cls.credentials.refresh(http)
-        cls.service = discovery.build('slides', 'v1', http=http)
-        cls.drive_service = discovery.build('drive', 'v3', http=http)
-        cls.sheets_service = discovery.build('sheets', 'v4', http=http)
+        cls.service = build('slides', 'v1', http=http)
+        cls.drive_service = build('drive', 'v3', http=http)
+        cls.sheets_service = build('sheets', 'v4', http=http)
         # Hide STDOUT output generated by snippets.
         cls.stdout = sys.stdout
         sys.stdout = None
