summaryrefslogtreecommitdiff
path: root/paste/httpserver.py
diff options
context:
space:
mode:
authorcce <devnull@localhost>2006-09-21 05:46:57 +0000
committercce <devnull@localhost>2006-09-21 05:46:57 +0000
commit3559f127031598b0dcc2a243454d2c15309a109b (patch)
treeadbc46bdde0022b8d751d173dfb0065c7319dcaa /paste/httpserver.py
parent9e4f83947cdb42dffdff973d0b9b12a2f775e3b1 (diff)
downloadpaste-3559f127031598b0dcc2a243454d2c15309a109b.tar.gz
Paste should not depend upon other paste modules, such
as Deploy. This patch moves 'converters' into paste.util since it was being used within paste proper. I'll leave it to those who know Deploy to update that. - copied converters.py from paste.deploy to paste.util - updated files that use paste.deploy.converters
Diffstat (limited to 'paste/httpserver.py')
-rwxr-xr-xpaste/httpserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/paste/httpserver.py b/paste/httpserver.py
index 29c5f0f..acebe05 100755
--- a/paste/httpserver.py
+++ b/paste/httpserver.py
@@ -20,6 +20,7 @@ if pyOpenSSL is installed, it also provides SSL capabilities.
import errno, socket, sys, threading, urlparse, Queue
from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
from SocketServer import ThreadingMixIn
+from paste.util import converters
__all__ = ['WSGIHandlerMixin','WSGIServer','WSGIHandler', 'serve']
__version__ = "0.5"
@@ -546,7 +547,6 @@ def serve(application, host=None, port=None, handler=None, ssl_pem=None,
Number of worker threads to create when ``use_threadpool`` is true. This
can be a string or an integer value.
"""
- from paste.deploy import converters
ssl_context = None
if ssl_pem:
assert SSL, "pyOpenSSL is not installed"