Merge pull request #885 from collinanderson/morewhitespace

clean code slightly

examples/echo.py

@@ -24,7 +24,6 @@ def app(environ, start_response):
     else:
         data = environ['wsgi.input'].read()
 
-
     status = '200 OK'
 
     response_headers = [

examples/frameworks/django/djangotest/testing/views.py

@@ -32,7 +32,6 @@ def home(request):
     else:
         form = MsgForm()
 
-
     return render_to_response('home.html', {
         'form': form,
         'subject': subject,

examples/frameworks/django/testing/testing/apps/someapp/views.py

@@ -30,7 +30,6 @@ def home(request):
             message = form.cleaned_data['message']
             f = request.FILES['f']
 
-
             if not hasattr(f, "fileno"):
                 size = len(f.read())
             else:
@@ -41,7 +40,6 @@ def home(request):
     else:
         form = MsgForm()
 
-
     return render_to_response('home.html', {
         'form': form,
         'subject': subject,

examples/slowclient.py

@@ -13,7 +13,8 @@ def app(environ, start_response):
     status = '200 OK'
     response_headers = [
         ('Content-type', 'text/plain'),
-        ('Content-Length', str(len(data)))    ]
+        ('Content-Length', str(len(data))),
+    ]
     sys.stdout.write('request received, pausing 10 seconds')
     sys.stdout.flush()
     time.sleep(10)

examples/timeout.py

@@ -14,7 +14,8 @@ def app(environ, start_response):
     status = '200 OK'
     response_headers = [
         ('Content-type', 'text/plain'),
-        ('Content-Length', str(len(data)))    ]
+        ('Content-Length', str(len(data))),
+    ]
     sys.stdout.write('request will timeout')
     sys.stdout.flush()
     time.sleep(35)

examples/when_ready.conf.py

@@ -22,7 +22,6 @@ class MemoryWatch(threading.Thread):
         used_mem = sum(int(x) for x in out.split('\n')[1:])
         return used_mem
 
-
     def run(self):
         while True:
             for (pid, worker) in list(self.server.WORKERS.items()):

gunicorn/arbiter.py

@@ -43,7 +43,7 @@ class Arbiter(object):
 
     # I love dynamic languages
     SIG_QUEUE = []
-    SIGNALS = [getattr(signal, "SIG%s" % x) \
+    SIGNALS = [getattr(signal, "SIG%s" % x)
             for x in "HUP QUIT INT TERM TTIN TTOU USR1 USR2 WINCH".split()]
     SIG_NAMES = dict(
         (getattr(signal, name), name[3:].lower()) for name in dir(signal)

gunicorn/config.py

@@ -224,8 +224,6 @@ class Setting(object):
     nargs = None
     const = None
 
-
-
     def __init__(self):
         if self.default is not None:
             self.set(self.default)

gunicorn/glogging.py

@@ -202,8 +202,8 @@ class Logger(object):
                 fileConfig(cfg.logconfig, defaults=CONFIG_DEFAULTS,
                         disable_existing_loggers=False)
             else:
-                raise RuntimeError("Error: log config '%s' not found" %
-                        cfg.logconfig)
+                msg = "Error: log config '%s' not found"
+                raise RuntimeError(msg % cfg.logconfig)
 
     def critical(self, msg, *args, **kwargs):
         self.error_log.critical(msg, *args, **kwargs)

gunicorn/instrument/statsd.py

@@ -82,7 +82,6 @@ class Statsd(Logger):
         except Exception:
             pass
 
-
     # access logging
     def access(self, resp, req, environ, request_time):
         """Measure request duration

gunicorn/pidfile.py

@@ -24,8 +24,8 @@ class Pidfile(object):
         if oldpid:
             if oldpid == os.getpid():
                 return
-            raise RuntimeError("Already running on PID %s " \
-                "(or pid file '%s' is stale)" % (oldpid, self.fname))
+            msg = "Already running on PID %s (or pid file '%s' is stale)"
+            raise RuntimeError(msg % (oldpid, self.fname))
 
         self.pid = pid
 

gunicorn/util.py

@@ -70,8 +70,8 @@ except ImportError:
             try:
                 dot = package.rindex('.', 0, dot)
             except ValueError:
-                raise ValueError("attempted relative import beyond top-level "
-                                  "package")
+                msg = "attempted relative import beyond top-level package"
+                raise ValueError(msg)
         return "%s.%s" % (package[:dot], name)
 
     def import_module(name, package=None):
@@ -112,8 +112,8 @@ def load_class(uri, default="gunicorn.workers.sync.SyncWorker",
             return pkg_resources.load_entry_point(dist, section, name)
         except:
             exc = traceback.format_exc()
-            raise RuntimeError("class uri %r invalid or not found: \n\n[%s]" % (uri,
-                exc))
+            msg = "class uri %r invalid or not found: \n\n[%s]"
+            raise RuntimeError(msg % (uri, exc))
     else:
         components = uri.split('.')
         if len(components) == 1:
@@ -130,8 +130,8 @@ def load_class(uri, default="gunicorn.workers.sync.SyncWorker",
                                 section, uri)
                 except:
                     exc = traceback.format_exc()
-                    raise RuntimeError("class uri %r invalid or not found: \n\n[%s]" % (uri,
-                        exc))
+                    msg = "class uri %r invalid or not found: \n\n[%s]"
+                    raise RuntimeError(msg % (uri, exc))
 
         klass = components.pop(-1)
 
@@ -139,9 +139,8 @@ def load_class(uri, default="gunicorn.workers.sync.SyncWorker",
             mod = import_module('.'.join(components))
         except:
             exc = traceback.format_exc()
-            raise RuntimeError(
-                    "class uri %r invalid or not found: \n\n[%s]" %
-                    (uri, exc))
+            msg = "class uri %r invalid or not found: \n\n[%s]"
+            raise RuntimeError(msg % (uri, exc))
         return getattr(mod, klass)
 
 
@@ -230,7 +229,6 @@ def parse_address(netloc, default_port=8000):
     if netloc.startswith("tcp://"):
         netloc = netloc.split("tcp://")[1]
 
-
     # get host
     if '[' in netloc and ']' in netloc:
         host = netloc.split(']')[0][1:].lower()
@@ -356,8 +354,8 @@ def import_app(module):
         __import__(module)
     except ImportError:
         if module.endswith(".py") and os.path.exists(module):
-            raise ImportError("Failed to find application, did "
-                "you mean '%s:%s'?" % (module.rsplit(".", 1)[0], obj))
+            msg = "Failed to find application, did you mean '%s:%s'?"
+            raise ImportError(msg % (module.rsplit(".", 1)[0], obj))
         else:
             raise
 

gunicorn/workers/base.py

@@ -12,9 +12,10 @@ import sys
 from gunicorn import util
 from gunicorn.workers.workertmp import WorkerTmp
 from gunicorn.reloader import Reloader
-from gunicorn.http.errors import InvalidHeader, InvalidHeaderName, \
-InvalidRequestLine, InvalidRequestMethod, InvalidHTTPVersion, \
-LimitRequestLine, LimitRequestHeaders
+from gunicorn.http.errors import (
+    InvalidHeader, InvalidHeaderName, InvalidRequestLine, InvalidRequestMethod,
+    InvalidHTTPVersion, LimitRequestLine, LimitRequestHeaders,
+)
 from gunicorn.http.errors import InvalidProxyLine, ForbiddenProxyRequest
 from gunicorn.http.wsgi import default_environ, Response
 from gunicorn.six import MAXSIZE
@@ -22,7 +23,7 @@ from gunicorn.six import MAXSIZE
 
 class Worker(object):
 
-    SIGNALS = [getattr(signal, "SIG%s" % x) \
+    SIGNALS = [getattr(signal, "SIG%s" % x)
             for x in "ABRT HUP QUIT INT TERM USR1 USR2 WINCH CHLD".split()]
 
     PIPE = []
@@ -159,7 +160,7 @@ class Worker(object):
         if isinstance(exc, (InvalidRequestLine, InvalidRequestMethod,
                 InvalidHTTPVersion, InvalidHeader, InvalidHeaderName,
                 LimitRequestLine, LimitRequestHeaders,
-            InvalidProxyLine, ForbiddenProxyRequest,)):
+                InvalidProxyLine, ForbiddenProxyRequest)):
 
             status_int = 400
             reason = "Bad Request"
@@ -185,11 +186,8 @@ class Worker(object):
                 mesg = "Request forbidden"
                 status_int = 403
 
-            self.log.debug("Invalid request from ip={ip}: {error}"\
-                           "".format(ip=addr[0],
-                                     error=str(exc),
-                                    )
-                          )
+            msg = "Invalid request from ip={ip}: {error}"
+            self.log.debug(msg.format(ip=addr[0], error=str(exc)))
         else:
             self.log.exception("Error handling request")
 

gunicorn/workers/ggevent.py

@@ -74,7 +74,6 @@ class GeventWorker(AsyncWorker):
                 _sock=s))
         self.sockets = sockets
 
-
     def notify(self):
         super(GeventWorker, self).notify()
         if self.ppid != os.getppid():

gunicorn/workers/gthread.py

@@ -70,7 +70,6 @@ class TConn(object):
                 self.sock = ssl.wrap_socket(client, server_side=True,
                         **self.cfg.ssl_options)
 
-
             # initialize the parser
             self.parser = http.RequestParser(self.cfg, self.sock)
             return True