Delint recent changes

Author: sqrrrl

.github/workflows/ci.yaml

@@ -6,7 +6,6 @@ on:
   pull_request:
     branches: [ master ]
   workflow_dispatch:
-    branches: [ master ]
 
 jobs:
   test:

.github/workflows/lint.yaml

@@ -20,7 +20,6 @@ on:
     branches:
       - master
   workflow_dispatch:
-    branches: [ master ]
 
 jobs:
   lint:

docs/mail-merge/docs_mail_merge_test.py

@@ -25,19 +25,18 @@
 import unittest
 
 import google.auth
-from docs_mail_merge import _copy_template, get_data, get_http_client
+from docs_mail_merge import _copy_template, get_data
 from googleapiclient import discovery
 
+creds, _ = google.auth.default()
+
 
 class TestDocsMailMerge(unittest.TestCase):
     'Unit tests for Mail Merge sample'
 
     def test_project(self):
         self.assertTrue(project_test())
 
-    def test_gapis(self):
-        self.assertTrue(gapis_test())
-
     def test_create_doc(self):
         self.assertTrue(create_doc_test())
 
@@ -56,18 +55,9 @@ def project_test():
     credentials, project = google.auth.default()
 
 
-def gapis_test():
-    'Tests whether project can connect to all 3 APIs used in the sample.'
-    HTTP = get_http_client()
-    discovery.build('drive', 'v3', http=HTTP)
-    discovery.build('docs', 'v1', http=HTTP)
-    discovery.build('sheets', 'v4', http=HTTP)
-    return True
-
-
 def create_doc_test():
     'Tests whether project can create and delete a Google Docs file.'
-    DRIVE = discovery.build('drive', 'v3', http=get_http_client())
+    DRIVE = discovery.build('drive', 'v3', credentials=creds)
     DATA = {
         'name': 'Test Doc',
         'mimeType': 'application/vnd.google-apps.document',
@@ -79,7 +69,7 @@ def create_doc_test():
 
 def copy_doc_test():
     'Tests whether project can copy and delete a Google Docs file.'
-    DRIVE = discovery.build('drive', 'v3', http=get_http_client())
+    DRIVE = discovery.build('drive', 'v3', credentials=creds)
     DOCS_FILE_ID = '1Xycxuuv7OhEQUuzbt_Mw0TPMq02MseSD1vZdBJ3nLjk'
     doc_id = _copy_template(DOCS_FILE_ID, 'text', DRIVE)
     DRIVE.files().delete(fileId=doc_id, fields='').execute()

forms/quickstart/quickstart.py

@@ -1,11 +1,11 @@
 # Copyright 2021 Google LLC
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     https://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -63,7 +63,7 @@
             "location": {
                 "index": 0
             }
-       }
+        }
     }]
 }
 
@@ -77,4 +77,4 @@
 get_result = form_service.forms().get(formId=result["formId"]).execute()
 print(get_result)
 
-# [END forms_quickstart]
+# [END forms_quickstart]

slides/snippets/slides_create_bulleted_text.py

@@ -65,7 +65,6 @@ def create_bulleted_text(presentation_id, shape_id):
 if __name__ == '__main__':
     # Put the presentation_id and shape_id
     # to be submitted.
-    create_bulleted_text("1VD1xmi1-9DonI4zmCKENTzlVxIL5SdGGTmbHmnBjQ1E"
-                         , "MyTextBox_9")
+    create_bulleted_text("1VD1xmi1-9DonI4zmCKENTzlVxIL5SdGGTmbHmnBjQ1E", "MyTextBox_9")
 
 # [END slides_create_bulleted_text]

slides/snippets/slides_image_merging.py

@@ -40,8 +40,6 @@ def image_merging(template_presentation_id,
 
         customer_graphic_url = image_url
 
-
-        # [START slides_image_merging]
         # Duplicate the template presentation using the Drive API.
         copy_title = customer_name + ' presentation'
         drive_response = drive_service.files().copy(

slides/snippets/slides_text_merging.py

@@ -114,7 +114,6 @@ def text_merging(template_presentation_id, data_spreadsheet_id):
 
         return response
 
-
     except HttpError as error:
         print(f"An error occurred: {error}")
         return error