Merge pull request #1027 from Carreau/cleanup

Carreau · web-flow · commit 5888059a1464 · 2022-11-07T11:22:14.000+01:00
Cleanup
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -34,10 +34,13 @@ jobs:
           python3 -m pip install -r requirements.in -r requirements-dev.txt
       - name: install mypy
         run: |
-          python3 -m pip install mypy types-pycurl types-requests types-Markdown
+          python3 -m pip install mypy types-pycurl types-requests types-Markdown pyflakes
       - name: run mypy
         run: |
           mypy nbviewer
+      - name: run pyflakes
+        run: |
+          pyflakes nbviewer
 
       - name: pip freeze
         run: |
diff --git a/nbviewer/_version.py b/nbviewer/_version.py
@@ -82,7 +82,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env=
                 stderr=(subprocess.PIPE if hide_stderr else None),
             )
             break
-        except EnvironmentError:
+        except OSError:
             e = sys.exc_info()[1]
             if e.errno == errno.ENOENT:
                 continue
@@ -92,7 +92,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env=
             return None, None
     else:
         if verbose:
-            print("unable to find command, tried %s" % (commands,))
+            print(f"unable to find command, tried {commands}")
         return None, None
     stdout = p.communicate()[0].strip().decode()
     if p.returncode != 0:
@@ -143,22 +143,21 @@ def git_get_keywords(versionfile_abs):
     # _version.py.
     keywords = {}
     try:
-        f = open(versionfile_abs, "r")
-        for line in f.readlines():
-            if line.strip().startswith("git_refnames ="):
-                mo = re.search(r'=\s*"(.*)"', line)
-                if mo:
-                    keywords["refnames"] = mo.group(1)
-            if line.strip().startswith("git_full ="):
-                mo = re.search(r'=\s*"(.*)"', line)
-                if mo:
-                    keywords["full"] = mo.group(1)
-            if line.strip().startswith("git_date ="):
-                mo = re.search(r'=\s*"(.*)"', line)
-                if mo:
-                    keywords["date"] = mo.group(1)
-        f.close()
-    except EnvironmentError:
+        with open(versionfile_abs) as f:
+            for line in f.readlines():
+                if line.strip().startswith("git_refnames ="):
+                    mo = re.search(r'=\s*"(.*)"', line)
+                    if mo:
+                        keywords["refnames"] = mo.group(1)
+                if line.strip().startswith("git_full ="):
+                    mo = re.search(r'=\s*"(.*)"', line)
+                    if mo:
+                        keywords["full"] = mo.group(1)
+                if line.strip().startswith("git_date ="):
+                    mo = re.search(r'=\s*"(.*)"', line)
+                    if mo:
+                        keywords["date"] = mo.group(1)
+    except OSError:
         pass
     return keywords
 
@@ -182,11 +181,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
         if verbose:
             print("keywords are unexpanded, not using")
         raise NotThisMethod("unexpanded keywords, not a git-archive tarball")
-    refs = set([r.strip() for r in refnames.strip("()").split(",")])
+    refs = {r.strip() for r in refnames.strip("()").split(",")}
     # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
     # just "foo-1.0". If we see a "tag: " prefix, prefer those.
     TAG = "tag: "
-    tags = set([r[len(TAG) :] for r in refs if r.startswith(TAG)])
+    tags = {r[len(TAG) :] for r in refs if r.startswith(TAG)}
     if not tags:
         # Either we're using git < 1.8.3, or there really are no tags. We use
         # a heuristic: assume all version tags have a digit. The old git %d
@@ -195,7 +194,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
         # between branches and tags. By ignoring refnames without digits, we
         # filter out many common branch names like "release" and
         # "stabilization", as well as "HEAD" and "master".
-        tags = set([r for r in refs if re.search(r"\d", r)])
+        tags = {r for r in refs if re.search(r"\d", r)}
         if verbose:
             print("discarding '%s', no digits" % ",".join(refs - tags))
     if verbose:
@@ -298,10 +297,9 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
             if verbose:
                 fmt = "tag '%s' doesn't start with prefix '%s'"
                 print(fmt % (full_tag, tag_prefix))
-            pieces["error"] = "tag '%s' doesn't start with prefix '%s'" % (
-                full_tag,
-                tag_prefix,
-            )
+            pieces[
+                "error"
+            ] = f"tag '{full_tag}' doesn't start with prefix '{tag_prefix}'"
             return pieces
         pieces["closest-tag"] = full_tag[len(tag_prefix) :]
 
diff --git a/nbviewer/app.py b/nbviewer/app.py
@@ -496,9 +496,7 @@ def fetch_kwargs(self):
         fetch_kwargs = dict(connect_timeout=10)
         if self.proxy_host:
             fetch_kwargs.update(proxy_host=self.proxy_host, proxy_port=self.proxy_port)
-            self.log.info(
-                "Using web proxy {proxy_host}:{proxy_port}." "".format(**fetch_kwargs)
-            )
+            self.log.info("Using web proxy %(proxy_host)s:%(proxy_port).", fetch_kwargs)
 
         if self.no_check_certificate:
             fetch_kwargs.update(validate_cert=False)
@@ -579,7 +577,7 @@ def static_paths(self):
     def template_paths(self):
         default_template_path = pjoin(here, "templates")
         if self.template_path:
-            self.log.info("Using custom template path {}".format(self.template_path))
+            self.log.info("Using custom template path %()s", self.template_path)
             template_paths = [self.template_path, default_template_path]
         else:
             template_paths = [default_template_path]
diff --git a/nbviewer/providers/__init__.py b/nbviewer/providers/__init__.py
@@ -83,7 +83,7 @@ def _load_provider_feature(feature, providers, **handler_names):
         try:
             # Ex: handler_names['url_handler']
             handler_names[provider_handler_key]
-        except KeyError as e:
+        except KeyError:
             continue
         else:
             # Ex: provider_handlers['url_handler'] = handler_names['url_handler']
diff --git a/nbviewer/providers/base.py b/nbviewer/providers/base.py
@@ -445,7 +445,7 @@ def write_error(self, status_code: int, **kwargs):
         # render the template
         try:
             html = self.render_status_code_template(status_code, **namespace)
-        except Exception as e:
+        except Exception:
             html = self.render_error_template(**namespace)
         self.set_header("Content-Type", "text/html")
         self.write(html)
@@ -561,7 +561,7 @@ async def cached_method(self, *args, **kwargs):
                 cached = pickle.loads(cached_pickle)
             else:
                 cached = None
-        except Exception as e:
+        except Exception:
             self.log.error("Exception getting %s from cache", short_url, exc_info=True)
             cached = None
 
@@ -631,7 +631,7 @@ def filter_formats(self, nb, raw):
             try:
                 if test is None or test(nb, raw):
                     yield (name, format)
-            except Exception as err:
+            except Exception:
                 self.log.info("Failed to test %s: %s", self.request.uri, name)
 
     # empty methods to be implemented by subclasses to make GET requests more modular
diff --git a/nbviewer/providers/dropbox/__init__.py b/nbviewer/providers/dropbox/__init__.py
@@ -1 +1,3 @@
 from .handlers import uri_rewrites
+
+__all__ = ["uri_rewrites"]
diff --git a/nbviewer/providers/gist/__init__.py b/nbviewer/providers/gist/__init__.py
@@ -1,2 +1,4 @@
 from .handlers import default_handlers
 from .handlers import uri_rewrites
+
+__all__ = ["default_handlers", "uri_rewrites"]
diff --git a/nbviewer/providers/github/__init__.py b/nbviewer/providers/github/__init__.py
@@ -1,2 +1,4 @@
 from .handlers import default_handlers
 from .handlers import uri_rewrites
+
+__all__ = ["default_handlers", "uri_rewrites"]
diff --git a/nbviewer/providers/github/client.py b/nbviewer/providers/github/client.py
@@ -6,7 +6,6 @@
 # -----------------------------------------------------------------------------
 import json
 import os
-from urllib.parse import urlparse
 
 from tornado.httpclient import AsyncHTTPClient
 from tornado.httpclient import HTTPError
diff --git a/nbviewer/providers/github/handlers.py b/nbviewer/providers/github/handlers.py
@@ -432,7 +432,7 @@ async def deliver_notebook(
                     nbjson = filedata.decode("utf-8")
                 else:
                     nbjson = filedata
-            except Exception as e:
+            except Exception:
                 self.log.error("Failed to decode notebook: %s", raw_url, exc_info=True)
                 raise web.HTTPError(400)
 
diff --git a/nbviewer/providers/local/__init__.py b/nbviewer/providers/local/__init__.py
@@ -1,2 +1,4 @@
 from .handlers import default_handlers
 from .handlers import LocalFileHandler
+
+__all__ = ["default_handlers", "LocalFileHandler"]
diff --git a/nbviewer/providers/url/__init__.py b/nbviewer/providers/url/__init__.py
@@ -1,2 +1,4 @@
 from .handlers import default_handlers
 from .handlers import uri_rewrites
+
+__all__ = ["default_handlers", "uri_rewrites"]
diff --git a/nbviewer/providers/url/handlers.py b/nbviewer/providers/url/handlers.py
@@ -56,7 +56,7 @@ async def get_notebook_data(self, secure, netloc, url):
             rfp.set_url(robots_url)
             rfp.parse(robotstxt.splitlines())
             public = rfp.can_fetch("*", remote_url)
-        except httpclient.HTTPError as e:
+        except httpclient.HTTPError:
             self.log.debug(
                 "Robots.txt not available for {}".format(remote_url), exc_info=True
             )
diff --git a/nbviewer/ratelimit.py b/nbviewer/ratelimit.py
@@ -42,8 +42,8 @@ async def check(self, handler):
             # it's been seen before, use incr
             try:
                 count = await self.cache.incr(key)
-            except Exception as e:
-                app_log.warning("Failed to increment rate limit for %s", key)
+            except Exception:
+                app_log.warning("Failed to increment rate limit for %()s", key)
                 return
 
             app_log.debug(
diff --git a/nbviewer/tests/test_config.py b/nbviewer/tests/test_config.py
@@ -1,6 +1,3 @@
-import os
-from subprocess import Popen
-
 import requests
 
 from .base import NBViewerTestCase
diff --git a/nbviewer/tests/test_index.py b/nbviewer/tests/test_index.py
@@ -1,7 +1,6 @@
 from unittest import skip
 
 from .base import NBViewerTestCase
-from nbviewer import index
 
 
 class ElasticSearchTestCase(NBViewerTestCase):
diff --git a/nbviewer/tests/test_security.py b/nbviewer/tests/test_security.py
@@ -5,9 +5,6 @@
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 # -----------------------------------------------------------------------------
-import os
-from unittest.mock import patch
-
 import pytest
 import requests
 
diff --git a/nbviewer/utils.py b/nbviewer/utils.py
@@ -12,7 +12,6 @@
 from base64 import decodebytes
 from base64 import encodebytes
 from contextlib import contextmanager
-from functools import lru_cache
 from subprocess import check_output
 from urllib.parse import parse_qs
 from urllib.parse import quote as stdlib_quote

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`from .handlers import uri_rewrites`
	`2`	`+`
	`3`	`+__all__ = ["uri_rewrites"]`