Fixes suggested by pyflakes

15 files changed, 6 insertions, 24 deletions

diff --git a/paste/docsupport/gensite.py b/paste/docsupport/gensite.py
index 3b3c6df..a5f4459 100755
--- a/paste/docsupport/gensite.py
+++ b/paste/docsupport/gensite.py
@@ -7,7 +7,6 @@ This is a very basic script to generate a site from a set of ReST
 documents.
 """
 
-import sys
 import os
 import re
 import shutil
diff --git a/paste/docsupport/metadata_real.py b/paste/docsupport/metadata_real.py
index a0b93eb..bea51f9 100644
--- a/paste/docsupport/metadata_real.py
+++ b/paste/docsupport/metadata_real.py
@@ -2,14 +2,10 @@
 # Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
 
 import sys
-import copy
-import types
 import inspect
-import new
 from itertools import count
 from paste.util import import_string
 from paste.util.classinit import ClassInitMeta
-from paste.util.classinstance import classinstancemethod
 
 doc_count = count()
 
diff --git a/paste/doctest_webapp.py b/paste/doctest_webapp.py
index 9b07d8a..6ffdc05 100755
--- a/paste/doctest_webapp.py
+++ b/paste/doctest_webapp.py
@@ -16,7 +16,6 @@ import cgi
 import rfc822
 from cStringIO import StringIO
 from paste import server
-from paste import wsgilib
 import PySourceColor
 
 
@@ -423,7 +422,6 @@ class LongFormDocTestParser(doctest.DocTestParser):
 
 
 if __name__ == '__main__':
-    import sys
     if sys.argv[1:] and sys.argv[1] == 'doctest':
         doctest.testmod()
         sys.exit()
diff --git a/paste/exceptions/collector.py b/paste/exceptions/collector.py
index 89be9bd..cd56544 100644
--- a/paste/exceptions/collector.py
+++ b/paste/exceptions/collector.py
@@ -19,7 +19,6 @@ supplements
 """
 
 import sys
-import cgi
 import traceback
 import time
 try:
diff --git a/paste/exceptions/errormiddleware.py b/paste/exceptions/errormiddleware.py
index 98e704d..86f782d 100644
--- a/paste/exceptions/errormiddleware.py
+++ b/paste/exceptions/errormiddleware.py
@@ -13,8 +13,6 @@ except ImportError:
     from StringIO import StringIO
 from paste.exceptions import formatter, collector, reporter
 from paste import wsgilib
-from paste.docsupport import metadata
-import pkg_resources
 from paste.deploy import converters
 
 __all__ = ['ErrorMiddleware', 'handle_exception']
diff --git a/paste/exceptions/reporter.py b/paste/exceptions/reporter.py
index 2690131..419d294 100644
--- a/paste/exceptions/reporter.py
+++ b/paste/exceptions/reporter.py
@@ -122,4 +122,4 @@ class WSGIAppReporter(Reporter):
 
     def __call__(self, environ, start_response):
         start_response('500 Server Error', [('Content-type', 'text/html')])
-        return [formatter.format_html(exc_data)]
+        return [formatter.format_html(self.exc_data)]
diff --git a/paste/fixture.py b/paste/fixture.py
index dc40bb2..034b266 100644
--- a/paste/fixture.py
+++ b/paste/fixture.py
@@ -23,10 +23,6 @@ try:
 except ImportError:
     pass
 
-if sys.version < (2, 4):
-    from paste.util import doctest24 as doctest
-else:
-    import doctest
 from paste import wsgilib
 from paste import lint
 
diff --git a/paste/flup_session.py b/paste/flup_session.py
index 4f7c9aa..a3074d6 100644
--- a/paste/flup_session.py
+++ b/paste/flup_session.py
@@ -44,7 +44,7 @@ class SessionMiddleware(object):
     def __init__(self, app,
                  global_conf,
                  session_type=NoDefault,
-                 cookie_name=NoDefault
+                 cookie_name=NoDefault,
                  **store_config
                  ):
         self.app = app
@@ -59,10 +59,10 @@ class SessionMiddleware(object):
                 % (self.session_type,
                    ', '.join(self.session_classes.keys())))
         kw = {}
-        for config_name, kw_name, coercer, default in store_args:
+        for config_name, kw_name, coercer, default in self.store_args:
             value = coercer(store_config.get(config_name, default))
             kw[kw_name] = value
-        self.store = store_class(**kw)
+        self.store = self.store_class(**kw)
         if cookie_name is NoDefault:
             cookie_name = global_conf.get('session_cookie', '_SID_')
         self.cookie_name = cookie_name
diff --git a/paste/lint.py b/paste/lint.py
index dd80ecc..b3bee02 100644
--- a/paste/lint.py
+++ b/paste/lint.py
@@ -3,7 +3,7 @@
 
 import re
 import sys
-from types import *
+from types import DictType, StringType, TupleType, ListType
 
 header_re = re.compile(r'^[a-zA-Z][a-zA-Z0-9\-_]*$')
 bad_header_value_re = re.compile(r'[\000-\037]')
diff --git a/paste/printdebug.py b/paste/printdebug.py
index 00915ad..e44b33b 100644
--- a/paste/printdebug.py
+++ b/paste/printdebug.py
@@ -1,7 +1,6 @@
 # (c) 2005 Ian Bicking and contributors; written for Paste (http://pythonpaste.org)
 # Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
 
-import sys
 from cStringIO import StringIO
 import re
 import cgi
diff --git a/paste/profilemiddleware.py b/paste/profilemiddleware.py
index 3b84cd0..64fa5ea 100644
--- a/paste/profilemiddleware.py
+++ b/paste/profilemiddleware.py
@@ -10,7 +10,6 @@ import cgi
 import time
 from cStringIO import StringIO
 from paste import wsgilib
-from paste.docsupport import metadata
 
 __all__ = ['ProfileMiddleware', 'profile_decorator']
 
diff --git a/paste/urlmap.py b/paste/urlmap.py
index d631754..61bba6d 100644
--- a/paste/urlmap.py
+++ b/paste/urlmap.py
@@ -5,7 +5,6 @@ from UserDict import DictMixin
 import re
 import os
 import wsgilib
-from docsupport import metadata
 
 __all__ = ['URLMap', 'PathProxyURLMap']
 
diff --git a/paste/urlparser.py b/paste/urlparser.py
index 0c2acc4..c95e86b 100644
--- a/paste/urlparser.py
+++ b/paste/urlparser.py
@@ -5,7 +5,6 @@ import os
 import sys
 import imp
 import wsgilib
-from paste.docsupport import metadata
 from paste.util import import_string
 from paste.deploy import converters
 
diff --git a/paste/wdg_validate.py b/paste/wdg_validate.py
index 3f38493..98b23d7 100644
--- a/paste/wdg_validate.py
+++ b/paste/wdg_validate.py
@@ -8,7 +8,6 @@ except ImportError:
     # Don't want this to be unimportable in older Python's
     subprocess = None
 from paste import wsgilib
-from paste.docsupport import metadata
 import re
 import cgi
 
diff --git a/paste/wsgilib.py b/paste/wsgilib.py
index c8ea591..5ccab10 100644
--- a/paste/wsgilib.py
+++ b/paste/wsgilib.py
@@ -10,6 +10,7 @@ from cStringIO import StringIO
 import mimetypes
 import os
 import cgi
+import sys
 
 __all__ = ['get_cookies', 'add_close', 'raw_interactive',
            'interactive', 'construct_url', 'error_body_response',