A big commit, primarily aesthetic/whitespace in nature. This is the result of running pylint over the codebase. Some minor/hard-to-reach typos were also picked up.

1 files changed, 8 insertions, 7 deletions

diff --git a/paste/wsgiwrappers.py b/paste/wsgiwrappers.py
index c67431a..de5bf1d 100644
--- a/paste/wsgiwrappers.py
+++ b/paste/wsgiwrappers.py
@@ -54,7 +54,7 @@ class WSGIRequest(object):
     You are free to subclass this object.
 
     """
-    def __init__(self, environ, urlvars={}):
+    def __init__(self, environ):
         self.environ = environ
         # This isn't "state" really, since the object is derivative:
         self.headers = EnvironHeaders(environ)
@@ -140,8 +140,8 @@ class WSGIResponse(object):
         self.cookies = SimpleCookie()
         self.status_code = code
         if not mimetype:
-             mimetype = "%s; charset=%s" % (settings['content_type'],
-                                            settings['charset'])
+            mimetype = "%s; charset=%s" % (settings['content_type'],
+                                           settings['charset'])
         self.headers['Content-Type'] = mimetype
 
         if 'encoding_errors' in settings:
@@ -218,10 +218,11 @@ class WSGIResponse(object):
         Define a cookie to be sent via the outgoing HTTP headers
         """
         self.cookies[key] = value
-        for var in ('max_age', 'path', 'domain', 'secure', 'expires'):
-            val = locals()[var]
-            if val is not None:
-                self.cookies[key][var.replace('_', '-')] = val
+        for var_name, var_value in [
+            ('max_age', max_age), ('path', path), ('domain', domain),
+            ('secure', secure), ('expires', expires)]:
+            if var_value is not None:
+                self.cookies[key][var_name.replace('_', '-')] = var_value
 
     def delete_cookie(self, key, path='/', domain=None):
         """