Merge pull request #1386 from consideRatio/pr/fix-flake8-warnings

manics · web-flow · commit 70390417889c · 2021-09-22T15:36:09.000+01:00
Fix various flake8 warnings
diff --git a/binderhub/base.py b/binderhub/base.py
@@ -118,7 +118,7 @@ def check_rate_limit(self):
         request_ip = self.request.remote_ip
         try:
             limit = rate_limiter.increment(request_ip)
-        except RateLimitExceeded as e:
+        except RateLimitExceeded:
             raise web.HTTPError(
                 429,
                 f"Rate limit exceeded. Try again in {rate_limiter.period_seconds} seconds.",
diff --git a/binderhub/build.py b/binderhub/build.py
@@ -412,7 +412,7 @@ def submit(self):
         )
 
         try:
-            ret = self.api.create_namespaced_pod(
+            _ = self.api.create_namespaced_pod(
                 self.namespace,
                 self.pod,
                 _request_timeout=KUBE_REQUEST_TIMEOUT,
@@ -468,7 +468,7 @@ def submit(self):
                         self.cleanup()
                     elif self.pod.status.phase == 'Failed':
                         self.cleanup()
-            except Exception as e:
+            except Exception:
                 app_log.exception("Error in watch stream for %s", self.name)
                 raise
             finally:
@@ -572,6 +572,6 @@ def stream_logs(self):
         self.progress(ProgressEvent.Kind.BUILD_STATUS_CHANGE, ProgressEvent.BuildStatus.COMPLETED)
         self.progress('log', json.dumps({
                 'phase': 'Deleted',
-                'message': f"Deleted...\n",
+                'message': "Deleted...\n",
              })
         )
diff --git a/binderhub/build_local.py b/binderhub/build_local.py
@@ -186,9 +186,9 @@ def submit(self):
             for line in _execute_cmd(cmd, capture=True, env=env):
                 self._handle_log(line)
             self.progress(ProgressEvent.Kind.BUILD_STATUS_CHANGE, ProgressEvent.BuildStatus.COMPLETED)
-        except subprocess.CalledProcessError as e:
+        except subprocess.CalledProcessError:
             self.progress(ProgressEvent.Kind.BUILD_STATUS_CHANGE, ProgressEvent.BuildStatus.FAILED)
-        except Exception as e:
+        except Exception:
             app_log.exception("Error in watch stream for %s", self.name)
             raise
 
diff --git a/binderhub/health.py b/binderhub/health.py
@@ -25,7 +25,7 @@ async def wrapper(*args, **kwargs):
             while attempts > 0:
                 try:
                     return await f(*args, **kwargs)
-                except Exception as e:
+                except Exception:
                     if attempts == 1:
                         raise
                     else:
@@ -47,7 +47,7 @@ def false_if_raises(f):
     async def wrapper(*args, **kwargs):
         try:
             res = await f(*args, **kwargs)
-        except Exception as e:
+        except Exception:
             app_log.exception(f"Error checking {f.__name__}")
             res = False
         return res
diff --git a/binderhub/launcher.py b/binderhub/launcher.py
@@ -73,10 +73,10 @@ def _default_hub_url_local(self):
         config=True,
         allow_none=True,
         help="""
-        An optional hook function that you can use to implement checks before starting a user's server. 
-        For example if you have a non-standard BinderHub deployment, 
+        An optional hook function that you can use to implement checks before starting a user's server.
+        For example if you have a non-standard BinderHub deployment,
         in this hook you can check if the current user has right to launch a new repo.
-        
+
         Receives 5 parameters: launcher, image, username, server_name, repo_url
         """
     )
diff --git a/binderhub/tests/test_launcher.py b/binderhub/tests/test_launcher.py
@@ -14,7 +14,7 @@ async def test_pre_launch_hook():
     launcher = Launcher(create_user=False, pre_launch_hook=my_pre_launch_hook)
     parameters = ['image', 'test_user', 'test_server', 'repo_url']
     with pytest.raises(web.HTTPError) as excinfo:
-        server_info = await launcher.launch(*parameters)
+        _ = await launcher.launch(*parameters)
     assert excinfo.value.status_code == 400
     message = excinfo.value.log_message
     assert parameters == message.split(':', 1)[-1].lstrip().split(',')
diff --git a/binderhub/tests/test_ratelimit.py b/binderhub/tests/test_ratelimit.py
@@ -37,7 +37,6 @@ def test_rate_limit_expires():
     r = RateLimiter(limit=10, period_seconds=60)
     assert r._limits == {}
     now = r.time()
-    reset = int(now) + 60
 
     for i in range(5):
         limit = r.increment("1.2.3.4")
@@ -56,7 +55,7 @@ def test_rate_limit_clean():
     assert r._limits == {}
     now = r.time()
 
-    limit = r.increment("1.2.3.4")
+    r.increment("1.2.3.4")
 
     with mock.patch.object(r, "time", lambda: now + 30):
         limit2 = r.increment("4.3.2.1")
diff --git a/binderhub/tests/test_registry.py b/binderhub/tests/test_registry.py
@@ -67,7 +67,7 @@ def initialize(self, test_handle):
         self.test_handle = test_handle
 
     def get(self):
-        scope = self.get_argument("scope")
+        self.get_argument("scope")
         auth_header = self.request.headers.get("Authorization", "")
         if not auth_header.startswith("Basic "):
             raise HTTPError(401, "No basic auth")
diff --git a/binderhub/tests/test_repoproviders.py b/binderhub/tests/test_repoproviders.py
@@ -199,7 +199,7 @@ def test_github_ref(repo, unresolved_ref, resolved_ref):
     full_url = provider.get_repo_url()
     assert full_url == f"https://github.com/{repo}"
     ref = IOLoop().run_sync(provider.get_resolved_ref)
-    if resolved_ref == True:
+    if resolved_ref is True:
         # True means it should resolve, but don't check value
         assert ref is not None
         assert is_valid_sha1(ref)
@@ -353,7 +353,7 @@ def test_long_spec(self):
 
     def test_spec_with_no_suggestion(self):
         spec = "short/master"
-        error = "^((?!Did you mean).)*$".format(spec)  # negative match
+        error = "^((?!Did you mean).)*$"  # negative match
         with self.assertRaisesRegex(ValueError, error):
             user, repo, unresolved_ref = tokenize_spec(spec)
 
@@ -393,7 +393,7 @@ def test_git_ref(url, unresolved_ref, resolved_ref):
     full_url = provider.get_repo_url()
     assert full_url == url
     ref = IOLoop().run_sync(provider.get_resolved_ref)
-    if resolved_ref == True:
+    if resolved_ref is True:
         # True means it should resolve, but don't check value
         assert ref is not None
         assert is_valid_sha1(ref)
@@ -461,7 +461,7 @@ def test_gitlab_ref(unresolved_ref, resolved_ref):
     full_url = provider.get_repo_url()
     assert full_url == f'https://gitlab.com/{namespace}.git'
     ref = IOLoop().run_sync(provider.get_resolved_ref)
-    if resolved_ref == True:
+    if resolved_ref is True:
         # True means it should resolve, but don't check value
         assert ref is not None
         assert is_valid_sha1(ref)
@@ -501,7 +501,7 @@ def test_gist_ref(owner, gist_id, unresolved_ref, resolved_ref):
     full_url = provider.get_repo_url()
     assert full_url == f"https://gist.github.com/{owner}/{gist_id}.git"
     ref = IOLoop().run_sync(provider.get_resolved_ref)
-    if resolved_ref == True:
+    if resolved_ref is True:
         # True means it should resolve, but don't check value
         assert ref is not None
         assert is_valid_sha1(ref)
diff --git a/binderhub/tests/test_utils.py b/binderhub/tests/test_utils.py
@@ -131,7 +131,7 @@ def test_ip_in_networks(ip, cidrs, found):
         assert message == f"message {net}"
         assert ipaddress.ip_address(ip) in net
     else:
-        assert match == False
+        assert match is False
 
 
 def test_ip_in_networks_invalid():
diff --git a/binderhub/tests/utils.py b/binderhub/tests/utils.py
@@ -8,6 +8,10 @@
 
 from tornado.curl_httpclient import CurlAsyncHTTPClient
 
+import asyncio
+from concurrent.futures import ThreadPoolExecutor
+import requests
+
 
 class MockAsyncHTTPClient(CurlAsyncHTTPClient):
     mocks = {}
@@ -88,12 +92,6 @@ async def fetch(self, req_or_url, *args, **kwargs):
 
 # async-request utility from jupyterhub.tests.utils v0.8.1
 # used under BSD license
-
-import asyncio
-from concurrent.futures import ThreadPoolExecutor
-import requests
-
-
 class _AsyncRequests:
     """Wrapper around requests to return a Future from request methods
 
diff --git a/binderhub/utils.py b/binderhub/utils.py
@@ -6,6 +6,9 @@
 
 from traitlets import Integer, TraitError
 
+from unittest.mock import Mock
+from kubernetes.client import api_client
+
 
 # default _request_timeout for kubernetes api requests
 # tuple of two timeouts: (connect_timeout, read_timeout)
@@ -200,9 +203,5 @@ def ip_in_networks(ip, networks, min_prefix_len=1):
 # to avoid instantiating ThreadPools.
 # This is known to work for kubernetes-4.0
 # and may need updating with later kubernetes clients
-
-from unittest.mock import Mock
-from kubernetes.client import api_client
-
 _dummy_pool = Mock()
 api_client.ThreadPool = lambda *args, **kwargs: _dummy_pool
diff --git a/doc/conf.py b/doc/conf.py
@@ -18,13 +18,13 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+from os.path import dirname
 import sys
 
-curdir = os.path.dirname(__file__)
+curdir = dirname(__file__)
 sys.path.append(os.path.abspath(os.path.join(curdir, 'script')))
 
 # set paths
-from os.path import dirname
 docs = dirname(dirname(__file__))
 root = dirname(docs)
 sys.path.insert(0, root)
diff --git a/helm-chart/images/image-cleaner/image-cleaner.py b/helm-chart/images/image-cleaner/image-cleaner.py
@@ -182,7 +182,7 @@ def main():
         else:
             images = get_docker_images(client)
             if not images:
-                logging.info(f'No images to delete')
+                logging.info('No images to delete')
                 time.sleep(interval)
                 continue
             else:
diff --git a/setup.py b/setup.py
@@ -10,8 +10,8 @@
 
 with open(os.path.join(here, 'requirements.txt')) as f:
     requirements = [
-        l.strip() for l in f.readlines()
-        if not l.strip().startswith('#')
+        line.strip() for line in f.readlines()
+        if not line.strip().startswith('#')
     ]
     # manually add pycurl here, see comment in requirements.txt
     requirements.append("pycurl")
diff --git a/testing/local-binder-local-hub/binderhub_config.py b/testing/local-binder-local-hub/binderhub_config.py
@@ -1,23 +1,23 @@
-######################################################################
-## A development config to test BinderHub locally.
-#
-# If you are running BidnerHub manually (not via JupyterHub) run
-# `python -m binderhub -f binderhub_config.py`
-#
-# Override the external access URL for JupyterHub by setting the
-# environment variable JUPYTERHUB_EXTERNAL_URL
-
-# Host IP is needed in a few places
+"""
+A development config to test BinderHub locally.
+
+If you are running BinderHub manually (not via JupyterHub) run
+`python -m binderhub -f binderhub_config.py`
+
+Override the external access URL for JupyterHub by setting the
+environment variable JUPYTERHUB_EXTERNAL_URL
+Host IP is needed in a few places
+"""
+import os
 import socket
+
+from binderhub.build_local import LocalRepo2dockerBuild
+
 s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 s.connect(("8.8.8.8", 80))
 hostip = s.getsockname()[0]
 s.close()
 
-from binderhub.build_local import LocalRepo2dockerBuild
-import os
-
-
 c.BinderHub.debug = True
 c.BinderHub.use_registry = False
 c.BinderHub.builder_required = False
diff --git a/testing/local-binder-local-hub/jupyterhub_config.py b/testing/local-binder-local-hub/jupyterhub_config.py
@@ -1,18 +1,22 @@
-######################################################################
-## A development config to test BinderHub locally.
-#
-# Run `jupyterhub --config=binderhub_config.py` terminal
+"""
+A development config to test BinderHub locally.
 
-# Host IP is needed in a few places
+Run `jupyterhub --config=binderhub_config.py` terminal
+Host IP is needed in a few places
+"""
+import os
 import socket
+
+from dockerspawner import DockerSpawner
+
+from binderhub.binderspawner_mixin import BinderSpawnerMixin
+
+
 s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 s.connect(("8.8.8.8", 80))
 hostip = s.getsockname()[0]
 s.close()
 
-from binderhub.binderspawner_mixin import BinderSpawnerMixin
-from dockerspawner import DockerSpawner
-import os
 
 # image & token are set via spawn options
 class LocalContainerSpawner(BinderSpawnerMixin, DockerSpawner):
@@ -36,7 +40,7 @@ class LocalContainerSpawner(BinderSpawnerMixin, DockerSpawner):
     "name": binderhub_service_name,
     "admin": True,
     "command": ["python", "-mbinderhub", f"--config={binderhub_config}"],
-    "url": f"http://localhost:8585",
+    "url": "http://localhost:8585",
     "environment": {"JUPYTERHUB_EXTERNAL_URL": os.getenv("JUPYTERHUB_EXTERNAL_URL", "")}
 }]
 c.JupyterHub.default_url = f"/services/{binderhub_service_name}/"
