From a4ddf955985ebdf2e114171507b38c7b9204093a Mon Sep 17 00:00:00 2001 From: Daniel Quinn Date: Tue, 23 Feb 2016 14:15:33 +0000 Subject: [PATCH 1/2] pep8 + print statement alignment The original: * Violated pep8 * Used `print()` both as a statement and as a function, guaranteeing that the code won't work in either Python 2.5 or 3.x * Didn't explain anything about what was happening. This change fixes two of those problems. --- samples/calendar_api/calendar_sample.py | 42 +++++++++++++------------ 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/samples/calendar_api/calendar_sample.py b/samples/calendar_api/calendar_sample.py index 2b791430357..bc384646a83 100644 --- a/samples/calendar_api/calendar_sample.py +++ b/samples/calendar_api/calendar_sample.py @@ -7,7 +7,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://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, @@ -23,25 +23,27 @@ from oauth2client import client from googleapiclient import sample_tools + def main(argv): - # Authenticate and construct service. - service, flags = sample_tools.init( - argv, 'calendar', 'v3', __doc__, __file__, - scope='https://www.googleapis.com/auth/calendar.readonly') - - try: - page_token = None - while True: - calendar_list = service.calendarList().list(pageToken=page_token).execute() - for calendar_list_entry in calendar_list['items']: - print calendar_list_entry['summary'] - page_token = calendar_list.get('nextPageToken') - if not page_token: - break - - except client.AccessTokenRefreshError: - print ('The credentials have been revoked or expired, please re-run' - 'the application to re-authorize.') + # Authenticate and construct service. + service, flags = sample_tools.init( + argv, 'calendar', 'v3', __doc__, __file__, + scope='https://www.googleapis.com/auth/calendar.readonly') + + try: + page_token = None + while True: + calendar_list = service.calendarList().list( + pageToken=page_token).execute() + for calendar_list_entry in calendar_list['items']: + print(calendar_list_entry['summary']) + page_token = calendar_list.get('nextPageToken') + if not page_token: + break + + except client.AccessTokenRefreshError: + print('The credentials have been revoked or expired, please re-run' + 'the application to re-authorize.') if __name__ == '__main__': - main(sys.argv) + main(sys.argv) From 28387f9f70a8b864e8668cc3aba79eccdedfac6e Mon Sep 17 00:00:00 2001 From: Daniel Quinn Date: Tue, 23 Feb 2016 14:17:15 +0000 Subject: [PATCH 2/2] Re-adjusted the spacing in the comments. --- samples/calendar_api/calendar_sample.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/calendar_api/calendar_sample.py b/samples/calendar_api/calendar_sample.py index bc384646a83..60c7e72ce6a 100644 --- a/samples/calendar_api/calendar_sample.py +++ b/samples/calendar_api/calendar_sample.py @@ -7,7 +7,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://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,