Fix http.py: Exception -> exception, lint errors, unit test. (googleapis#724)

busunkim96 · web-flow · commit 0ba1ca4435aa · 2019-07-23T14:42:53.000-07:00
* Exception -&gt; exception.

* Assign exception = None

* Fix lint errors.

* Fix test_media_file_upload_closes_fd_in__del__
diff --git a/googleapiclient/http.py b/googleapiclient/http.py
@@ -149,14 +149,15 @@ def _retry_request(http, num_retries, req_type, sleep, rand, uri, method, *args,
   """
   resp = None
   content = None
+  exception = None
   for retry_num in range(num_retries + 1):
     if retry_num > 0:
       # Sleep before retrying.
       sleep_time = rand() * 2 ** retry_num
       LOGGER.warning(
           'Sleeping %.2f seconds before retry %d of %d for %s: %s %s, after %s',
           sleep_time, retry_num, num_retries, req_type, method, uri,
-          resp.status if resp else Exception)
+          resp.status if resp else exception)
       sleep(sleep_time)
 
     try:
diff --git a/samples/coordinate/coordinate.py b/samples/coordinate/coordinate.py
@@ -45,6 +45,8 @@
 
 from oauth2client import client
 from googleapiclient import sample_tools
+from googleapiclient.discovery import build
+from googleapiclient.discovery import http
 
 # Declare command-line flags.
 argparser = argparse.ArgumentParser(add_help=False)
@@ -61,7 +63,7 @@ def main(argv):
 
   try:
     # List all the jobs for a team
-    jobs_result = service.jobs().list(teamId=FLAGS.teamId).execute(http=http)
+    jobs_result = service.jobs().list(teamId=flags.teamId).execute(http=http)
 
     print('List of Jobs:')
     pprint.pprint(jobs_result)
diff --git a/tests/test_http.py b/tests/test_http.py
@@ -213,8 +213,12 @@ class TestMediaUpload(unittest.TestCase):
   def test_media_file_upload_closes_fd_in___del__(self):
     file_desc = mock.Mock(spec=io.TextIOWrapper)
     opener = mock.mock_open(file_desc)
-    with mock.patch('__builtin__.open', return_value=opener):
-      upload = MediaFileUpload(datafile('test_close'), mimetype='text/plain')
+    if PY3:
+      with mock.patch('builtins.open', return_value=opener):
+        upload = MediaFileUpload(datafile('test_close'), mimetype='text/plain')
+    else:
+      with mock.patch('__builtin__.open', return_value=opener):
+        upload = MediaFileUpload(datafile('test_close'), mimetype='text/plain')     
     self.assertIs(upload.stream(), file_desc)
     del upload
     file_desc.close.assert_called_once_with()
