diff options
| -rw-r--r-- | paste/httpexceptions.py | 3 | ||||
| -rw-r--r-- | paste/profilemiddleware.py | 9 | ||||
| -rw-r--r-- | paste/urlparser.py | 4 | ||||
| -rw-r--r-- | tests/conftest.py | 4 | ||||
| -rw-r--r-- | tests/test_auth/test_auth_cookie.py | 3 | ||||
| -rw-r--r-- | tests/test_auth/test_auth_digest.py | 3 | ||||
| -rw-r--r-- | tests/test_exceptions/test_httpexceptions.py | 3 | ||||
| -rw-r--r-- | tests/urlparser_data/hook/__init__.py | 4 | ||||
| -rw-r--r-- | tests/urlparser_data/not_found/user/__init__.py | 4 |
9 files changed, 22 insertions, 15 deletions
diff --git a/paste/httpexceptions.py b/paste/httpexceptions.py index 95fa5cf..0180925 100644 --- a/paste/httpexceptions.py +++ b/paste/httpexceptions.py @@ -71,7 +71,8 @@ Exception import types import sys -from wsgilib import has_header, header_value, catch_errors_app +from wsgilib import catch_errors_app +from response import has_header, header_value from util.quoting import strip_html, html_quote class HTTPException(Exception): diff --git a/paste/profilemiddleware.py b/paste/profilemiddleware.py index 43d8dca..07294ed 100644 --- a/paste/profilemiddleware.py +++ b/paste/profilemiddleware.py @@ -10,6 +10,7 @@ import cgi import time from cStringIO import StringIO from paste import wsgilib +from paste import response __all__ = ['ProfileMiddleware', 'profile_decorator'] @@ -44,10 +45,10 @@ class ProfileMiddleware(object): self.limit = limit def __call__(self, environ, start_response): - response = [] + catch_response = [] body = [] def replace_start_response(status, headers): - response.extend([status, headers]) + catch_response.extend([status, headers]) start_response(status, headers) return body.append def run_app(): @@ -61,8 +62,8 @@ class ProfileMiddleware(object): finally: prof.close() body = ''.join(body) - headers = response[1] - content_type = wsgilib.header_value(headers, 'content-type') + headers = catch_response[1] + content_type = response.header_value(headers, 'content-type') if not content_type.startswith('text/html'): # We can't add info to non-HTML output return [body] diff --git a/paste/urlparser.py b/paste/urlparser.py index 9d43a1a..17c2fef 100644 --- a/paste/urlparser.py +++ b/paste/urlparser.py @@ -335,7 +335,7 @@ def make_directory(parser, environ, filename): URLParser.register_constructor('dir', make_directory) def make_unknown(parser, environ, filename): - return wsgilib.send_file(filename) + return fileapp.FileApp(filename) URLParser.register_constructor('*', make_unknown) @@ -431,7 +431,7 @@ class StaticURLParser(object): return self.__class__(full)(environ, start_response) if environ.get('PATH_INFO') and environ.get('PATH_INFO') != '/': return self.error_extra_path(environ, start_response) - return wsgilib.send_file(full)(environ, start_response) + return fileapp.FileApp(full)(environ, start_response) def add_slash(self, environ, start_response): """ diff --git a/tests/conftest.py b/tests/conftest.py index 658441c..0f1f3b7 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -23,8 +23,10 @@ class SetupDirectory(py.test.collect.Directory): def __init__(self, *args, **kw): super(SetupDirectory, self).__init__(*args, **kw) if option.raise_warnings: - print "Setting up warnings" import warnings warnings.filterwarnings('error') Directory = SetupDirectory + +import warnings +warnings.filterwarnings('error') diff --git a/tests/test_auth/test_auth_cookie.py b/tests/test_auth/test_auth_cookie.py index 2bec414..1cf50c2 100644 --- a/tests/test_auth/test_auth_cookie.py +++ b/tests/test_auth/test_auth_cookie.py @@ -3,7 +3,8 @@ # the MIT License: http://www.opensource.org/licenses/mit-license.php from paste.auth import cookie -from paste.wsgilib import raw_interactive, header_value, dump_environ +from paste.wsgilib import raw_interactive, dump_environ +from paste.response import header_value from paste.httpexceptions import * from Cookie import SimpleCookie import urllib2, os diff --git a/tests/test_auth/test_auth_digest.py b/tests/test_auth/test_auth_digest.py index 1c0ced0..5db7291 100644 --- a/tests/test_auth/test_auth_digest.py +++ b/tests/test_auth/test_auth_digest.py @@ -3,7 +3,8 @@ # the MIT License: http://www.opensource.org/licenses/mit-license.php from paste.auth import digest -from paste.wsgilib import raw_interactive, header_value +from paste.wsgilib import raw_interactive +from paste.response import header_value from paste.httpexceptions import * import os diff --git a/tests/test_exceptions/test_httpexceptions.py b/tests/test_exceptions/test_httpexceptions.py index 5f72b20..1c24a4a 100644 --- a/tests/test_exceptions/test_httpexceptions.py +++ b/tests/test_exceptions/test_httpexceptions.py @@ -7,7 +7,8 @@ WSGI Exception Middleware Regression Test Suite """ from paste.httpexceptions import * -from paste.wsgilib import header_value, raw_interactive +from paste.wsgilib import raw_interactive +from paste.response import header_value import py def test_HTTPMove(): diff --git a/tests/urlparser_data/hook/__init__.py b/tests/urlparser_data/hook/__init__.py index 9b1055c..985a930 100644 --- a/tests/urlparser_data/hook/__init__.py +++ b/tests/urlparser_data/hook/__init__.py @@ -1,7 +1,7 @@ -from paste import wsgilib +from paste import request def urlparser_hook(environ): - first, rest = wsgilib.path_info_split(environ.get('PATH_INFO', '')) + first, rest = request.path_info_split(environ.get('PATH_INFO', '')) if not first: # No username return diff --git a/tests/urlparser_data/not_found/user/__init__.py b/tests/urlparser_data/not_found/user/__init__.py index c47f88e..4126c04 100644 --- a/tests/urlparser_data/not_found/user/__init__.py +++ b/tests/urlparser_data/not_found/user/__init__.py @@ -1,8 +1,8 @@ -from paste import wsgilib +from paste import request def not_found_hook(environ, start_response): urlparser = environ['paste.urlparser.not_found_parser'] - first, rest = wsgilib.path_info_split(environ.get('PATH_INFO', '')) + first, rest = request.path_info_split(environ.get('PATH_INFO', '')) if not first: # No username return |