Merge branch 'main' into fix-flake8-F841

Author: parthea

apiclient/__init__.py

@@ -1,6 +1,5 @@
 """Retain apiclient as an alias for googleapiclient."""
 
-import googleapiclient
 from googleapiclient import channel, discovery, errors, http, mimeparse, model
 
 try:

describe.py

@@ -34,7 +34,7 @@
 
 import uritemplate
 
-from googleapiclient.discovery import DISCOVERY_URI, build, build_from_document
+from googleapiclient.discovery import DISCOVERY_URI, build_from_document
 from googleapiclient.http import build_http
 
 DISCOVERY_DOC_DIR = (

expandsymlinks.py

@@ -18,41 +18,36 @@
 """Copy files from source to dest expanding symlinks along the way.
 """
 
-from shutil import copytree
-
 import argparse
+from shutil import copytree
 import sys
 
-
 # Ignore these files and directories when copying over files into the snapshot.
-IGNORE = set(['.hg', 'httplib2', 'oauth2', 'simplejson', 'static'])
+IGNORE = set([".hg", "httplib2", "oauth2", "simplejson", "static"])
 
 # In addition to the above files also ignore these files and directories when
 # copying over samples into the snapshot.
-IGNORE_IN_SAMPLES = set(['googleapiclient', 'oauth2client', 'uritemplate'])
+IGNORE_IN_SAMPLES = set(["googleapiclient", "oauth2client", "uritemplate"])
 
 parser = argparse.ArgumentParser(description=__doc__)
 
-parser.add_argument('--source', default='.',
-                    help='Directory name to copy from.')
+parser.add_argument("--source", default=".", help="Directory name to copy from.")
 
-parser.add_argument('--dest', default='snapshot',
-                    help='Directory name to copy to.')
+parser.add_argument("--dest", default="snapshot", help="Directory name to copy to.")
 
 
 def _ignore(path, names):
-  retval = set()
-  if path != '.':
-    retval = retval.union(IGNORE_IN_SAMPLES.intersection(names))
-  retval = retval.union(IGNORE.intersection(names))
-  return retval
+    retval = set()
+    if path != ".":
+        retval = retval.union(IGNORE_IN_SAMPLES.intersection(names))
+    retval = retval.union(IGNORE.intersection(names))
+    return retval
 
 
 def main():
-  copytree(FLAGS.source, FLAGS.dest, symlinks=True,
-            ignore=_ignore)
+    copytree(FLAGS.source, FLAGS.dest, symlinks=True, ignore=_ignore)
 
 
-if __name__ == '__main__':
-  FLAGS = parser.parse_args(sys.argv[1:])
-  main()
+if __name__ == "__main__":
+    FLAGS = parser.parse_args(sys.argv[1:])
+    main()

googleapiclient/discovery_cache/__init__.py

@@ -16,7 +16,6 @@
 
 from __future__ import absolute_import
 
-import datetime
 import logging
 import os
 
@@ -37,8 +36,6 @@ def autodetect():
     """
     if "APPENGINE_RUNTIME" in os.environ:
         try:
-            from google.appengine.api import memcache
-
             from . import appengine_memcache
 
             return appengine_memcache.cache

googleapiclient/discovery_cache/file_cache.py

@@ -27,7 +27,6 @@
 import logging
 import os
 import tempfile
-import threading
 
 try:
     from oauth2client.contrib.locked_file import LockedFile

noxfile.py

@@ -25,6 +25,7 @@
     "scripts",
     "tests",
     "describe.py",
+    "expandsymlinks.py",
     "noxfile.py",
     "owlbot.py",
     "setup.py",

samples/adexchangeseller/get_all_alerts.py

@@ -22,7 +22,6 @@
 
 __author__ = '[email protected] (Sérgio Gomes)'
 
-import argparse
 import sys
 
 from googleapiclient import sample_tools

samples/adexchangeseller/get_all_dimensions.py

@@ -22,7 +22,6 @@
 
 __author__ = '[email protected] (Sérgio Gomes)'
 
-import argparse
 import sys
 
 from googleapiclient import sample_tools

samples/adexchangeseller/get_all_metrics.py

@@ -22,7 +22,6 @@
 
 __author__ = '[email protected] (Sérgio Gomes)'
 
-import argparse
 import sys
 
 from googleapiclient import sample_tools

samples/adexchangeseller/get_all_preferred_deals.py

@@ -22,7 +22,6 @@
 
 __author__ = '[email protected] (Sérgio Gomes)'
 
-import argparse
 import sys
 
 from googleapiclient import sample_tools