Python 3 linting fixes

grant · grant · commit 12a171a32c7e · 2018-07-30T12:16:00.000-07:00
diff --git a/.pylintrc b/.pylintrc
@@ -424,3 +424,6 @@ max-public-methods=50
 # Exceptions that will emit a warning when being caught. Defaults to
 # "Exception"
 overgeneral-exceptions=Exception
+
+# Python 2/3 compatibility
+disable=useless-object-inheritance
diff --git a/drive/driveapp/main.py b/drive/driveapp/main.py
@@ -5,6 +5,7 @@
 This script uploads a single file to Google Drive.
 """
 
+from __future__ import print_function
 import pprint
 import httplib2
 import apiclient.discovery
@@ -30,7 +31,7 @@
 flow = oauth2client.client.flow_from_clientsecrets(CLIENT_SECRETS, OAUTH2_SCOPE)
 flow.redirect_uri = oauth2client.client.OOB_CALLBACK_URN
 authorize_url = flow.step1_get_authorize_url()
-print 'Go to the following link in your browser: ' + authorize_url
+print('Go to the following link in your browser: ' + authorize_url)
 code = raw_input('Enter verification code: ').strip()
 credentials = flow.step2_exchange(code)
 
diff --git a/slides/snippets/test_snippets.py b/slides/snippets/test_snippets.py
@@ -97,13 +97,13 @@ def test_image_merging(self):
             SnippetsTest.CUSTOMER_NAME)
         presentation_id = response.get('presentationId')
         self.assertIsNotNone(presentation_id, msg=pformat(response))
-        self.assertEquals(2, len(response.get('replies')),
+        self.assertEqual(2, len(response.get('replies')),
             msg=pformat(response))
         num_replacements = 0
         for reply in response.get('replies'):
             num_replacements += reply.get('replaceAllShapesWithImage') \
                 .get('occurrencesChanged')
-        self.assertEquals(2, num_replacements)
+        self.assertEqual(2, num_replacements)
         self.delete_file_on_cleanup(presentation_id)
 
     def test_simple_text_replace(self):
@@ -112,31 +112,31 @@ def test_simple_text_replace(self):
         box_id = self.create_test_textbox(presentation_id, page_id)
         response = self.snippets.simple_text_replace(
             presentation_id, box_id, 'MY NEW TEXT')
-        self.assertEquals(2, len(response.get('replies')),
+        self.assertEqual(2, len(response.get('replies')),
             msg=pformat(response))
 
     def test_text_style_update(self):
         presentation_id = self.create_test_presentation()
         page_id = self.add_slides(presentation_id, 1, 'BLANK')[0]
         box_id = self.create_test_textbox(presentation_id, page_id)
         response = self.snippets.text_style_update(presentation_id, box_id)
-        self.assertEquals(3, len(response.get('replies')),
+        self.assertEqual(3, len(response.get('replies')),
             msg=pformat(response))
 
     def test_create_bulleted_text(self):
         presentation_id = self.create_test_presentation()
         page_id = self.add_slides(presentation_id, 1, 'BLANK')[0]
         box_id = self.create_test_textbox(presentation_id, page_id)
         response = self.snippets.create_bulleted_text(presentation_id, box_id)
-        self.assertEquals(1, len(response.get('replies')),
+        self.assertEqual(1, len(response.get('replies')),
             msg=pformat(response))
 
     def test_create_sheets_chart(self):
         presentation_id = self.create_test_presentation()
         page_id = self.add_slides(presentation_id, 1, 'BLANK')[0]
         response = self.snippets.create_sheets_chart(presentation_id,
             page_id, SnippetsTest.DATA_SPREADSHEET_ID, SnippetsTest.CHART_ID)
-        self.assertEquals(1, len(response.get('replies')),
+        self.assertEqual(1, len(response.get('replies')),
             msg=pformat(response))
         chart_id = response.get('replies')[0].get('createSheetsChart') \
             .get('objectId')
@@ -148,7 +148,7 @@ def test_refresh_sheets_chart(self):
         chart_id = self.create_test_sheets_chart(presentation_id,
             page_id, SnippetsTest.DATA_SPREADSHEET_ID, SnippetsTest.CHART_ID)
         response = self.snippets.refresh_sheets_chart(presentation_id, chart_id)
-        self.assertEquals(1, len(response.get('replies')),
+        self.assertEqual(1, len(response.get('replies')),
             msg=pformat(response))
 
 if __name__ == '__main__':
