Added try except and comments

anuraggoogler · anuraggoogler · commit 1fdbc90ec3d1 · 2021-12-14T15:32:47.000Z
diff --git a/drive/activity-v2/quickstart.py b/drive/activity-v2/quickstart.py
@@ -16,6 +16,7 @@
 from __future__ import print_function
 import os.path
 from googleapiclient.discovery import build
+from googleapiclient.errors import HttpError
 from google_auth_oauthlib.flow import InstalledAppFlow
 from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
@@ -72,8 +73,9 @@ def main():
                 # Print the action occurred on drive with actor, target item and timestamp
                 print(u'{0}: {1}, {2}, {3}'.format(time, action, actor_name, target_name))
 
-    except Exception as error:
-        print('An error occurred: %s' % error)
+    except HttpError as error:
+        # TODO(developer) - Handleerrors from drive activity API.
+        print(f'An error occurred: {error}')
 
 
 # Returns the name of a set property in an object, or else "unknown".
diff --git a/drive/driveapp/main.py b/drive/driveapp/main.py
@@ -9,6 +9,7 @@
 import six
 import httplib2
 from googleapiclient.discovery import build
+from googleapiclient.errors import HttpError
 import googleapiclient.http
 import oauth2client.client
 
@@ -27,42 +28,44 @@
 TITLE = 'My New Text Document'
 DESCRIPTION = 'A shiny new text document about hello world.'
 
+
 # Perform OAuth2.0 authorization flow.
-try:
-    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)
-    # `six` library supports Python2 and Python3 without redefining builtin input()
-    code = six.moves.input('Enter verification code: ').strip()
-    credentials = flow.step2_exchange(code)
+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)
+# `six` library supports Python2 and Python3 without redefining builtin input()
+code = six.moves.input('Enter verification code: ').strip()
+credentials = flow.step2_exchange(code)
 
-    # Create an authorized Drive API client.
-    http = httplib2.Http()
-    credentials.authorize(http)
-    drive_service = build('drive', 'v2', http=http)
+# Create an authorized Drive API client.
+http = httplib2.Http()
+credentials.authorize(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 = googleapiclient.http.MediaFileUpload(
-        FILENAME,
-        mimetype=MIMETYPE,
-        resumable=True
-    )
-    # The body contains the metadata for the file.
-    body = {
-        'title': TITLE,
-        'description': DESCRIPTION,
-    }
+# Insert a file. Files are comprised of contents and metadata.
+# MediaFileUpload abstracts uploading file contents from a file on disk.
+media_body = googleapiclient.http.MediaFileUpload(
+    FILENAME,
+    mimetype=MIMETYPE,
+    resumable=True
+)
+# The body contains the metadata for the file.
+body = {
+    'title': TITLE,
+    'description': DESCRIPTION,
+}
 
-    # Perform the request and print the result.
+# Perform the request and print the result.
+try:
     new_file = drive_service.files().insert(
         body=body, media_body=media_body).execute()
     file_title = new_file.get('title')
     file_desc = new_file.get('description')
     if file_title == TITLE and file_desc == DESCRIPTION:
         print(f"File is uploaded \nTitle : {file_title}  \nDescription : {file_desc}")
 
-except Exception as error:
-    print('An error occurred: %s' % error)
+except HttpError as error:
+    # TODO(developer) - Handleerrors from drive API.
+    print(f'An error occurred: {error}')
diff --git a/drive/quickstart/quickstart.py b/drive/quickstart/quickstart.py
@@ -16,6 +16,7 @@
 from __future__ import print_function
 import os.path
 from googleapiclient.discovery import build
+from googleapiclient.errors import HttpError
 from google_auth_oauthlib.flow import InstalledAppFlow
 from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
@@ -32,24 +33,23 @@ def main():
     # The file token.json stores the user's access and refresh tokens, and is
     # created automatically when the authorization flow completes for the first
     # time.
-    try:
-        if os.path.exists('token.json'):
-            creds = Credentials.from_authorized_user_file('token.json', SCOPES)
-        # If there are no (valid) credentials available, let the user log in.
-        if not creds or not creds.valid:
-            if creds and creds.expired and creds.refresh_token:
-                creds.refresh(Request())
-            else:
-                flow = InstalledAppFlow.from_client_secrets_file(
-                    'credentials.json', SCOPES)
-                creds = flow.run_local_server(port=0)
-            # Save the credentials for the next run
-            with open('token.json', 'w') as token:
-                token.write(creds.to_json())
+    if os.path.exists('token.json'):
+        creds = Credentials.from_authorized_user_file('token.json', SCOPES)
+    # If there are no (valid) credentials available, let the user log in.
+    if not creds or not creds.valid:
+        if creds and creds.expired and creds.refresh_token:
+            creds.refresh(Request())
+        else:
+            flow = InstalledAppFlow.from_client_secrets_file('credentials.json', SCOPES)
+            creds = flow.run_local_server(port=0)
+        # Save the credentials for the next run
+        with open('token.json', 'w') as token:
+            token.write(creds.to_json())
 
-        service = build('drive', 'v3', credentials=creds)
+    service = build('drive', 'v3', credentials=creds)
 
-        # Call the Drive v3 API
+    # Call the Drive v3 API
+    try:
         results = service.files().list(
             pageSize=10, fields="nextPageToken, files(id, name)").execute()
         items = results.get('files', [])
@@ -62,8 +62,9 @@ def main():
             for item in items:
                 print(u'{0} ({1})'.format(item['name'], item['id']))
 
-    except Exception as error:
-        print('An error occurred: %s' % error)
+    except HttpError as error:
+        # TODO(developer) - Handleerrors from drive API.
+        print(f'An error occurred: {error}')
 
 
 if __name__ == '__main__':
diff --git a/gmail/quickstart/quickstart.py b/gmail/quickstart/quickstart.py
@@ -17,6 +17,7 @@
 import os.path
 from googleapiclient.discovery import build
 from google_auth_oauthlib.flow import InstalledAppFlow
+from googleapiclient.errors import HttpError
 from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
 
@@ -32,24 +33,23 @@ def main():
     # The file token.json stores the user's access and refresh tokens, and is
     # created automatically when the authorization flow completes for the first
     # time.
-    try:
-        if os.path.exists('token.json'):
-            creds = Credentials.from_authorized_user_file('token.json', SCOPES)
-        # If there are no (valid) credentials available, let the user log in.
-        if not creds or not creds.valid:
-            if creds and creds.expired and creds.refresh_token:
-                creds.refresh(Request())
-            else:
-                flow = InstalledAppFlow.from_client_secrets_file(
-                    'credentials.json', SCOPES)
-                creds = flow.run_local_server(port=0)
-            # Save the credentials for the next run
-            with open('token.json', 'w') as token:
-                token.write(creds.to_json())
+    if os.path.exists('token.json'):
+        creds = Credentials.from_authorized_user_file('token.json', SCOPES)
+    # If there are no (valid) credentials available, let the user log in.
+    if not creds or not creds.valid:
+        if creds and creds.expired and creds.refresh_token:
+            creds.refresh(Request())
+        else:
+            flow = InstalledAppFlow.from_client_secrets_file('credentials.json', SCOPES)
+            creds = flow.run_local_server(port=0)
+        # Save the credentials for the next run
+        with open('token.json', 'w') as token:
+            token.write(creds.to_json())
 
-        service = build('gmail', 'v1', credentials=creds)
+    service = build('gmail', 'v1', credentials=creds)
 
-        # Call the Gmail API
+    # Call the Gmail API
+    try:
         results = service.users().labels().list(userId='me').execute()
         labels = results.get('labels', [])
 
@@ -60,8 +60,9 @@ def main():
             for label in labels:
                 print(label['name'])
 
-    except Exception as error:
-        print('An error occurred: %s' % error)
+    except HttpError as error:
+        # TODO(developer) - Handleerrors from gmail API.
+        print(f'An error occurred: {error}')
 
 
 if __name__ == '__main__':
