Moved all the internal uses of wsgilib to their correct forms now

6 files changed, 13 insertions, 8 deletions

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