Clean up Python 2 styled code

docs/StyleGuide.txt

@@ -64,7 +64,7 @@ Python Style Guide.  Some things to take particular note of:
 
 * Docstrings are good.  They should look like::
 
-    class AClass(object):
+    class AClass:
         """
         doc string...
         """

docs/do-it-yourself-framework.txt

@@ -150,7 +150,7 @@ have to start with some root object, of course, which we'll pass in...
 
 ::
 
-    class ObjectPublisher(object):
+    class ObjectPublisher:
 
         def __init__(self, root):
             self.root = root
@@ -222,7 +222,7 @@ class into a module ``objectpub``::
 
     from objectpub import ObjectPublisher
 
-    class Root(object):
+    class Root:
 
         # The "index" method:
         def __call__(self):
@@ -260,12 +260,12 @@ request is a little slim.
     # insensitive keys:
     from paste.response import HeaderDict
 
-    class Request(object):
+    class Request:
         def __init__(self, environ):
             self.environ = environ
             self.fields = parse_formvars(environ)
 
-    class Response(object):
+    class Response:
         def __init__(self):
             self.headers = HeaderDict(
                 {'content-type': 'text/html'})
@@ -286,7 +286,7 @@ we'll attach the request and response objects here.
 So, let's remind ourselves of what the ``__call__`` function looked
 like::
 
-    class ObjectPublisher(object):
+    class ObjectPublisher:
         ...
 
         def __call__(self, environ, start_response):
@@ -301,7 +301,7 @@ Lets's update that::
     import threading
     webinfo = threading.local()
 
-    class ObjectPublisher(object):
+    class ObjectPublisher:
         ...
 
         def __call__(self, environ, start_response):
@@ -361,7 +361,7 @@ response).
 To give an example of a really really simple middleware, here's one
 that capitalizes the response::
 
-    class Capitalizer(object):
+    class Capitalizer:
 
         # We generally pass in the application to be wrapped to
         # the middleware constructor:
@@ -391,7 +391,7 @@ is a somewhat more thorough implementation of this.
 
        from webob import Request
 
-       class Capitalizer(object):
+       class Capitalizer:
            def __init__(self, app):
                self.app = app
            def __call__(self, environ, start_response):
@@ -402,7 +402,7 @@ is a somewhat more thorough implementation of this.
 
 So here's some code that does something useful, authentication::
 
-    class AuthMiddleware(object):
+    class AuthMiddleware:
 
         def __init__(self, wrap_app):
             self.wrap_app = wrap_app
@@ -450,7 +450,7 @@ So here's some code that does something useful, authentication::
 
        from webob import Request, Response
 
-       class AuthMiddleware(object):
+       class AuthMiddleware:
            def __init__(self, app):
                self.app = app
            def __call__(self, environ, start_response):

docs/url-parsing-with-wsgi.txt

@@ -69,7 +69,7 @@ request and responsibility for the response off to another object
 (another actor, really).  In the process we can actually retain some
 control -- we can capture and transform the response, and we can
 modify the request -- but that's not what the typical URL resolver will
-do.  
+do.
 
 Motivations
 ===========
@@ -80,7 +80,7 @@ Typically when a framework first supports WSGI or is integrated into
 Paste, it is "monolithic" with respect to URLs.  That is, you define
 (in Paste, or maybe in Apache) a "root" URL, and everything under that
 goes into the framework.  What the framework does internally, Paste
-does not know -- it probably finds internal objects to dispatch to, 
+does not know -- it probably finds internal objects to dispatch to,
 but the framework is opaque to Paste.  Not just to Paste, but to
 any code that isn't in that framework.
 
@@ -171,7 +171,7 @@ in turn may delegate to yet another application.
 
 Here's a very simple implementation of URLParser::
 
-    class URLParser(object):
+    class URLParser:
         def __init__(self, dir):
             self.dir = dir
         def __call__(self, environ, start_response):
@@ -217,7 +217,7 @@ handle it.  This "application" might be a URLParser or similar system
 
 ::
 
-    class GrabDate(object):
+    class GrabDate:
         def __init__(self, subapp):
             self.subapp = subapp
         def __call__(self, environ, start_response):
@@ -249,12 +249,12 @@ well -- it usually just means use ``getattr`` with the popped
 segments.  But we'll implement a rough approximation of `Quixote's
 <http://www.mems-exchange.org/software/quixote/>`_ URL parsing::
 
-    class ObjectApp(object):
+    class ObjectApp:
         def __init__(self, obj):
             self.obj = obj
         def __call__(self, environ, start_response):
             next = wsgilib.path_info_pop(environ)
-            if next is None: 
+            if next is None:
                 # This is the object, lets serve it...
                 return self.publish(obj, environ, start_response)
             next = next or '_q_index' # the default index method
@@ -288,7 +288,7 @@ Things to note:
   (when ``next`` is ``None``).  This means ``_q_traverse`` has to
   consume extra segments of the path.  In this version ``_q_traverse``
   is only given the next piece of the path; Quixote gives it the
-  entire path (as a list of segments).  
+  entire path (as a list of segments).
 
 * ``publish`` is really a small and lame way to turn a Quixote object
   into a WSGI application.  For any serious framework you'd want to do
@@ -298,7 +298,7 @@ Things to note:
   <http://www.python.org/peps/pep-0246.html>`_ to convert objects into
   applications.  This would include removing the explicit creation of
   new ``ObjectApp`` instances, which could also be a kind of fall-back
-  adaptation. 
+  adaptation.
 
 Anyway, this example is less complete, but maybe it will get you
 thinking.

paste/auth/auth_tkt.py

@@ -52,7 +52,7 @@
 DEFAULT_DIGEST = hashlib.md5
 
 
-class AuthTicket(object):
+class AuthTicket:
 
     """
     This class represents an authentication token.  You must pass in
@@ -221,7 +221,7 @@ def maybe_encode(s, encoding='utf8'):
     return s
 
 
-class AuthTKTMiddleware(object):
+class AuthTKTMiddleware:
 
     """
     Middleware that checks for signed cookies that match what

paste/auth/basic.py

@@ -31,7 +31,7 @@
     WWW_AUTHENTICATE,
 )
 
-class AuthBasicAuthenticator(object):
+class AuthBasicAuthenticator:
     """
     implements ``Basic`` authentication details
     """
@@ -59,7 +59,7 @@ def authenticate(self, environ):
 
     __call__ = authenticate
 
-class AuthBasicHandler(object):
+class AuthBasicHandler:
     """
     HTTP/1.0 ``Basic`` authentication middleware
 

paste/auth/cookie.py

@@ -79,7 +79,7 @@ def new_secret():
     secret = secret.encode('utf8')
     return secret
 
-class AuthCookieSigner(object):
+class AuthCookieSigner:
     """
     save/restore ``environ`` entries via digially signed cookie
 
@@ -195,7 +195,7 @@ def append(self, value):
             return
         list.append(self, str(value))
 
-class AuthCookieHandler(object):
+class AuthCookieHandler:
     """
     the actual handler that should be put in your middleware stack
 

paste/auth/digest.py

@@ -54,7 +54,7 @@ def _split_auth_string(auth_string):
                 prev = "%s,%s" % (prev, item)
                 continue
         except AttributeError:
-            if prev == None:
+            if prev is None:
                 prev = item
                 continue
             else:
@@ -78,7 +78,7 @@ def digest_password(realm, username, password):
     content = content.encode('utf8')
     return md5(content).hexdigest()
 
-class AuthDigestAuthenticator(object):
+class AuthDigestAuthenticator:
     """ implementation of RFC 2617 - HTTP Digest Authentication """
     def __init__(self, realm, authfunc):
         self.nonce    = {} # list to prevent replay attacks
@@ -156,15 +156,15 @@ def authenticate(self, environ):
             if qop:
                 assert 'auth' == qop
                 assert nonce and nc
-        except:
+        except Exception:
             return self.build_authentication()
         ha1 = self.authfunc(environ, realm, username)
         return self.compute(ha1, username, response, method, authpath,
                             nonce, nc, cnonce, qop)
 
     __call__ = authenticate
 
-class AuthDigestHandler(object):
+class AuthDigestHandler:
     """
     middleware for HTTP Digest authentication (RFC 2617)
 

paste/auth/form.py

@@ -44,7 +44,7 @@
 </html>
 """
 
-class AuthFormHandler(object):
+class AuthFormHandler:
     """
     HTML-based login middleware
 

paste/auth/multi.py

@@ -32,7 +32,7 @@
 
 """
 
-class MultiHandler(object):
+class MultiHandler:
     """
     Multiple Authentication Handler
 

paste/cascade.py

@@ -40,7 +40,7 @@ def make_cascade(loader, global_conf, catch='404', **local_conf):
     apps = [app for name, app in apps]
     return Cascade(apps, catch=catch)
 
-class Cascade(object):
+class Cascade:
 
     """
     Passed a list of applications, ``Cascade`` will try each of them

paste/cgiapp.py

@@ -116,7 +116,7 @@ def __call__(self, environ, start_response):
             start_response(writer.status, writer.headers)
         return []
 
-class CGIWriter(object):
+class CGIWriter:
 
     def __init__(self, environ, start_response):
         self.environ = environ

paste/cgitb_catcher.py

@@ -10,26 +10,22 @@
 from io import StringIO
 import sys
 
-from paste.util import converters
+from paste.util import converters, NO_DEFAULT
 from paste.util.cgitb_hook import Hook
 
 
-class NoDefault:
-    ...
-
-
 class CgitbMiddleware:
 
     def __init__(self, app,
                  global_conf=None,
-                 display=NoDefault,
+                 display=NO_DEFAULT,
                  logdir=None,
                  context=5,
                  format="html"):
         self.app = app
         if global_conf is None:
             global_conf = {}
-        if display is NoDefault:
+        if display is NO_DEFAULT:
             display = global_conf.get('debug')
         if isinstance(display, str):
             display = converters.asbool(display)
@@ -66,7 +62,7 @@ def catching_iter(self, app_iter, environ):
             if not error_on_close and hasattr(app_iter, 'close'):
                 try:
                     app_iter.close()
-                except:
+                except Exception:
                     close_response = self.exception_handler(
                         sys.exc_info(), environ)
                     response += (
@@ -88,7 +84,7 @@ def exception_handler(self, exc_info, environ):
 
 
 def make_cgitb_middleware(app, global_conf,
-                          display=NoDefault,
+                          display=NO_DEFAULT,
                           logdir=None,
                           context=5,
                           format='html'):
@@ -108,7 +104,7 @@ def make_cgitb_middleware(app, global_conf,
         source code
     """
     from paste.deploy.converters import asbool
-    if display is not NoDefault:
+    if display is not NO_DEFAULT:
         display = asbool(display)
     if 'debug' in global_conf:
         global_conf['debug'] = asbool(global_conf['debug'])

paste/config.py

@@ -2,8 +2,11 @@
 # Written for Paste (http://pythonpaste.org)
 # Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
 """Paste Configuration Middleware and Objects"""
+
+from paste.util import NO_DEFAULT
 from paste.registry import RegistryManager, StackedObjectProxy
 
+
 __all__ = ['DispatchingConfig', 'CONFIG', 'ConfigMiddleware']
 
 class DispatchingConfig(StackedObjectProxy):
@@ -79,7 +82,7 @@ def _current_obj(self):
 
 CONFIG = DispatchingConfig()
 
-no_config = object()
+
 class ConfigMiddleware(RegistryManager):
     """
     A WSGI middleware that adds a ``paste.config`` key (by default)
@@ -96,15 +99,15 @@ def __init__(self, application, config, dispatching_config=CONFIG,
         of the configuration `config`.
         """
         def register_config(environ, start_response):
-            popped_config = environ.get(environ_key, no_config)
+            popped_config = environ.get(environ_key, NO_DEFAULT)
             current_config = environ[environ_key] = config.copy()
             environ['paste.registry'].register(dispatching_config,
                                                current_config)
 
             try:
                 app_iter = application(environ, start_response)
             finally:
-                if popped_config is no_config:
+                if popped_config is NO_DEFAULT:
                     environ.pop(environ_key, None)
                 else:
                     environ[environ_key] = popped_config

paste/cowbell/__init__.py

@@ -6,7 +6,7 @@
 
 SOUND = "http://www.c-eye.net/eyeon/WalkenWAVS/explorestudiospace.wav"
 
-class MoreCowbell(object):
+class MoreCowbell:
     def __init__(self, app):
         self.app = app
     def __call__(self, environ, start_response):