From ebf7227f6ea8735c5f17ef9078e4543bfcb38a8c Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 22 Apr 2015 02:20:30 +0200 Subject: Fix pyflakes warnings * Remove unused variables * Remove unused imports * Remove dead code --- paste/errordocument.py | 3 +-- paste/httpheaders.py | 1 - paste/httpserver.py | 3 +-- paste/registry.py | 1 - paste/reloader.py | 2 +- paste/util/datetimeutil.py | 1 - paste/util/template.py | 2 -- 7 files changed, 3 insertions(+), 10 deletions(-) (limited to 'paste') diff --git a/paste/errordocument.py b/paste/errordocument.py index b5f34fe..34f2d4a 100644 --- a/paste/errordocument.py +++ b/paste/errordocument.py @@ -168,7 +168,6 @@ class StatusBasedForward(object): def __call__(self, environ, start_response): url = [] - writer = [] def change_response(status, headers, exc_info=None): status_code = status.split(' ') @@ -370,7 +369,7 @@ class _StatusBasedRedirect(object): forward.start_response = eat_start_response try: app_iter = forward(url_, new_environ) - except InvalidForward as e: + except InvalidForward: code, message = code_message[0] environ['wsgi.errors'].write( 'Error occurred in ' diff --git a/paste/httpheaders.py b/paste/httpheaders.py index 3c11bad..5457138 100644 --- a/paste/httpheaders.py +++ b/paste/httpheaders.py @@ -135,7 +135,6 @@ dashes to give CamelCase style names. """ import mimetypes -import re import six from time import time as now try: diff --git a/paste/httpserver.py b/paste/httpserver.py index fcd629c..6d825b8 100755 --- a/paste/httpserver.py +++ b/paste/httpserver.py @@ -395,7 +395,7 @@ else: return (conn, info) def _auto_ssl_context(): - import OpenSSL, time, random + import OpenSSL, random pkey = OpenSSL.crypto.PKey() pkey.generate_key(OpenSSL.crypto.TYPE_RSA, 768) @@ -945,7 +945,6 @@ class ThreadPool(object): self.kill_worker(worker.thread_id) self.logger.info('Workers killed forcefully') if force_quit_timeout: - hung = [] timed_out = False need_force_quit = bool(zombies) for workers in self.workers: diff --git a/paste/registry.py b/paste/registry.py index c240c53..908bc0d 100644 --- a/paste/registry.py +++ b/paste/registry.py @@ -90,7 +90,6 @@ quick way to work around it is documented. """ import six -import sys import paste.util.threadinglocal as threadinglocal __all__ = ['StackedObjectProxy', 'RegistryManager', 'StackedObjectRestorer', diff --git a/paste/reloader.py b/paste/reloader.py index b1b6c74..15c4d1c 100644 --- a/paste/reloader.py +++ b/paste/reloader.py @@ -100,7 +100,7 @@ class Monitor(object): for module in sys.modules.values(): try: filename = module.__file__ - except (AttributeError, ImportError) as exc: + except (AttributeError, ImportError): continue if filename is not None: filenames.append(filename) diff --git a/paste/util/datetimeutil.py b/paste/util/datetimeutil.py index 2938978..3c6d7d9 100644 --- a/paste/util/datetimeutil.py +++ b/paste/util/datetimeutil.py @@ -81,7 +81,6 @@ def parse_timedelta(val): return timedelta(hours=int(val), minutes=60*(val % 1.0)) fHour = ("h" in val or ":" in val) fMin = ("m" in val or ":" in val) - fFraction = "." in val for noise in "minu:teshour()": val = val.replace(noise, ' ') val = val.strip() diff --git a/paste/util/template.py b/paste/util/template.py index 10a08ae..f0826af 100644 --- a/paste/util/template.py +++ b/paste/util/template.py @@ -264,7 +264,6 @@ def sub(content, **kw): name = kw.get('__name') tmpl = Template(content, name=name) return tmpl.substitute(kw) - return result def paste_script_template_renderer(content, vars, filename=None): tmpl = Template(content, name=filename) @@ -370,7 +369,6 @@ def sub_html(content, **kw): name = kw.get('__name') tmpl = HTMLTemplate(content, name=name) return tmpl.substitute(kw) - return result ############################################################ -- cgit v1.2.1