diff options
| -rw-r--r-- | paste/debug/profile.py | 1 | ||||
| -rw-r--r-- | paste/exceptions/formatter.py | 3 | ||||
| -rw-r--r-- | paste/fixture.py | 2 | ||||
| -rw-r--r-- | paste/httpexceptions.py | 1 | ||||
| -rw-r--r-- | paste/reloader.py | 3 | ||||
| -rw-r--r-- | paste/request.py | 2 | ||||
| -rw-r--r-- | paste/response.py | 1 | ||||
| -rw-r--r-- | paste/transaction.py | 2 | ||||
| -rw-r--r-- | paste/translogger.py | 1 | ||||
| -rw-r--r-- | paste/urlmap.py | 4 | ||||
| -rw-r--r-- | paste/urlparser.py | 1 | ||||
| -rw-r--r-- | paste/util/PySourceColor.py | 5 | ||||
| -rwxr-xr-x | paste/util/httpserver.py | 5 | ||||
| -rw-r--r-- | setup.py | 2 |
14 files changed, 20 insertions, 13 deletions
diff --git a/paste/debug/profile.py b/paste/debug/profile.py index 07294ed..f2b90ed 100644 --- a/paste/debug/profile.py +++ b/paste/debug/profile.py @@ -9,7 +9,6 @@ import threading import cgi import time from cStringIO import StringIO -from paste import wsgilib from paste import response __all__ = ['ProfileMiddleware', 'profile_decorator'] diff --git a/paste/exceptions/formatter.py b/paste/exceptions/formatter.py index ef1b825..94ec90f 100644 --- a/paste/exceptions/formatter.py +++ b/paste/exceptions/formatter.py @@ -244,7 +244,8 @@ class HTMLFormatter(TextFormatter): return 'Module <span class="module" title="%s">%s</span>:<b>%s</b> in <code>%s</code>' % ( filename, frame.modname or '?', frame.lineno or '?', frame.name or '?') - return 'File %r, line %s in <tt>%s</tt>' % (filename, lineno, name) + return 'File %r, line %s in <tt>%s</tt>' % ( + filename, frame.lineno, frame.name) def format_long_source(self, source, long_source): q_long_source = str2html(long_source, False, 4, True) q_source = str2html(source, True, 0, False) diff --git a/paste/fixture.py b/paste/fixture.py index a3602c1..1fead67 100644 --- a/paste/fixture.py +++ b/paste/fixture.py @@ -596,7 +596,7 @@ class TestResponse(object): if href_pat and not href_pat(el_href): printlog(" Skipped: doesn't match href") continue - if html_pat and not html_pat(link_anchor): + if html_pat and not html_pat(el_html): printlog(" Skipped: doesn't match html") continue printlog(" Accepted") diff --git a/paste/httpexceptions.py b/paste/httpexceptions.py index 0180925..837fd66 100644 --- a/paste/httpexceptions.py +++ b/paste/httpexceptions.py @@ -70,7 +70,6 @@ Exception """ import types -import sys from wsgilib import catch_errors_app from response import has_header, header_value from util.quoting import strip_html, html_quote diff --git a/paste/reloader.py b/paste/reloader.py index 6fa0a27..6144b60 100644 --- a/paste/reloader.py +++ b/paste/reloader.py @@ -27,6 +27,9 @@ import atexit from paste.util.classinstance import classinstancemethod def install(poll_interval=1, raise_keyboard_interrupt=True): + """ + Install the reloading monitor. + """ mon = Monitor(poll_interval=poll_interval, raise_keyboard_interrupt=raise_keyboard_interrupt) t = threading.Thread(target=mon.periodic_reload) diff --git a/paste/request.py b/paste/request.py index d09dfee..67e765f 100644 --- a/paste/request.py +++ b/paste/request.py @@ -14,7 +14,7 @@ environment to solve common requirements. * path_info_pop(environ) """ -import cgi, string +import cgi from Cookie import SimpleCookie __all__ = ['get_cookies', 'parse_querystring', 'parse_formvars', diff --git a/paste/response.py b/paste/response.py index a6a9364..4751048 100644 --- a/paste/response.py +++ b/paste/response.py @@ -1,6 +1,7 @@ ############################################################ ## Headers ############################################################ +import warnings class HeaderDict(dict): diff --git a/paste/transaction.py b/paste/transaction.py index b7fbc4e..0632058 100644 --- a/paste/transaction.py +++ b/paste/transaction.py @@ -11,7 +11,7 @@ two-phase commit goodness that I don't need. This is experimental, and will change in the future. """ -from paste.httpexceptions import HTTPError, HTTPException +from paste.httpexceptions import HTTPException from wsgilib import catch_errors class ConnectionFactory(object): diff --git a/paste/translogger.py b/paste/translogger.py index cd2dc77..bafc79f 100644 --- a/paste/translogger.py +++ b/paste/translogger.py @@ -28,7 +28,6 @@ class TransLogger(object): if logger is None: self.logger = logging.getLogger(self.logger_name) if setup_console_handler: - import sys console = logging.StreamHandler() console.setLevel(logging.DEBUG) # We need to control the exact format: diff --git a/paste/urlmap.py b/paste/urlmap.py index e480848..ad70cad 100644 --- a/paste/urlmap.py +++ b/paste/urlmap.py @@ -1,11 +1,13 @@ # (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 +""" +Map URL prefixes to WSGI applications. See ``URLMap`` +""" from UserDict import DictMixin import re import os import httpexceptions -import wsgilib __all__ = ['URLMap', 'PathProxyURLMap'] diff --git a/paste/urlparser.py b/paste/urlparser.py index 17c2fef..e948a52 100644 --- a/paste/urlparser.py +++ b/paste/urlparser.py @@ -6,7 +6,6 @@ import sys import imp import pkg_resources import mimetypes -import wsgilib import request import fileapp from paste.util import import_string diff --git a/paste/util/PySourceColor.py b/paste/util/PySourceColor.py index f23c328..f346747 100644 --- a/paste/util/PySourceColor.py +++ b/paste/util/PySourceColor.py @@ -1,6 +1,9 @@ -#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
+PySourceColor: color Python source code
+"""
+
+"""
PySourceColor.py
----------------------------------------------------------------------------
diff --git a/paste/util/httpserver.py b/paste/util/httpserver.py index 969356a..dd2be43 100755 --- a/paste/util/httpserver.py +++ b/paste/util/httpserver.py @@ -10,7 +10,9 @@ if pyOpenSSL is installed, it also provides SSL capabilities. """ import BaseHTTPServer, SocketServer -import urlparse, sys, time, socket +import urlparse +import sys +import socket try: from paste.httpexceptions import HTTPServerError @@ -289,7 +291,6 @@ def serve(application, host=None, port=None, handler=None, ssl_pem=None, if __name__ == '__main__': # serve exactly 3 requests and then stop, use an external # program like wget or curl to submit these 3 requests. - import os from paste.wsgilib import dump_environ #serve(dump_environ, ssl_pem="test.pem") serve(dump_environ, server_version="Wombles/1.0", @@ -147,7 +147,7 @@ Other Tools httpexceptions = paste.httpexceptions:make_middleware lint = paste.lint:middleware login = paste.login:middleware - printdebug = paste.debug:prints:PrintDebugMiddleware + printdebug = paste.debug.prints:PrintDebugMiddleware profile = paste.debug.profile:ProfileMiddleware [hotshot] recursive = paste.recursive:RecursiveMiddleware # This isn't good enough to deserve the name egg:Paste#session: |