moving httpserver from util sub-package up a level

8 files changed, 7 insertions, 7 deletions

diff --git a/paste/auth/basic.py b/paste/auth/basic.py
index cfacb28..0f7f72c 100644
--- a/paste/auth/basic.py
+++ b/paste/auth/basic.py
@@ -11,7 +11,7 @@ are using SSL or need to work with very out-dated clients, instead
 use ``digest`` authentication.
 
 >>> from paste.wsgilib import dump_environ
->>> from paste.util.httpserver import serve
+>>> from paste.httpserver import serve
 >>> # from paste.auth.basic import AuthBasicHandler
 >>> realm = 'Test Realm'
 >>> def authfunc(username, password):
diff --git a/paste/auth/cas.py b/paste/auth/cas.py
index 92c7996..6e501b5 100644
--- a/paste/auth/cas.py
+++ b/paste/auth/cas.py
@@ -93,7 +93,7 @@ __all__ = ['CASLoginFailure', 'CASAuthenticate', 'AuthCASHandler' ]
 if '__main__' == __name__:
     authority = "https://secure.its.yale.edu/cas/servlet/"
     from paste.wsgilib import dump_environ
-    from paste.util.httpserver import serve
+    from paste.httpserver import serve
     from paste.httpexceptions import *
     serve(HTTPExceptionHandler(
              AuthCASHandler(dump_environ, authority)))
diff --git a/paste/auth/cookie.py b/paste/auth/cookie.py
index da6a558..4c4fb74 100644
--- a/paste/auth/cookie.py
+++ b/paste/auth/cookie.py
@@ -16,7 +16,7 @@ Following is a very simple example where a form is presented asking for
 a user name (no actual checking), and dummy session identifier (perhaps
 corresponding to a database session id) is stored in the cookie.
 
->>> from paste.util.httpserver import serve
+>>> from paste.httpserver import serve
 >>> from paste.fileapp import DataApp
 >>> from paste.httpexceptions import *
 >>> # from paste.auth.cookie import AuthCookiehandler
diff --git a/paste/auth/digest.py b/paste/auth/digest.py
index b8005c3..9e7bcba 100644
--- a/paste/auth/digest.py
+++ b/paste/auth/digest.py
@@ -13,7 +13,7 @@ takes care of requesting and handling authentication requests.  This
 module has been tested with several common browsers "out-in-the-wild".
 
 >>> from paste.wsgilib import dump_environ
->>> from paste.util.httpserver import serve
+>>> from paste.httpserver import serve
 >>> # from paste.auth.digest import digest_password, AuthDigestHandler
 >>> realm = 'Test Realm'
 >>> def authfunc(realm, username):
diff --git a/paste/auth/form.py b/paste/auth/form.py
index 3dbe375..6cab687 100644
--- a/paste/auth/form.py
+++ b/paste/auth/form.py
@@ -13,7 +13,7 @@ code or way to save the user's authorization; however, it is easy enough
 to put ``paste.auth.cookie`` in your application stack.
 
 >>> from paste.wsgilib import dump_environ
->>> from paste.util.httpserver import serve
+>>> from paste.httpserver import serve
 >>> from paste.auth.cookie import AuthCookieHandler
 >>> from paste.auth.form import AuthFormHandler
 >>> def authfunc(username, password):
diff --git a/paste/auth/multi.py b/paste/auth/multi.py
index bb09b3e..47becae 100644
--- a/paste/auth/multi.py
+++ b/paste/auth/multi.py
@@ -15,7 +15,7 @@ stack; by default it uses form-based authentication unless
 
 >>> from paste.auth import form, cookie, digest, multi
 >>> from paste.wsgilib import dump_environ
->>> from paste.util.httpserver import serve
+>>> from paste.httpserver import serve
 >>>
 >>> multi = multi.MultiHandler(dump_environ)
 >>> def authfunc(realm, user):
diff --git a/paste/debug/testserver.py b/paste/debug/testserver.py
index 616f4ca..3bc2bd9 100755
--- a/paste/debug/testserver.py
+++ b/paste/debug/testserver.py
@@ -11,7 +11,7 @@ where using raw_interactive won't do.
 
 """
 import time
-from paste.util.httpserver import *
+from paste.httpserver import *
 
 class WSGIRegressionServer(WSGIServer):
     """
diff --git a/paste/util/httpserver.py b/paste/httpserver.py
index b317a84..b317a84 100755
--- a/paste/util/httpserver.py
+++ b/paste/httpserver.py