[Zope-Checkins] SVN: Zope/branches/tseaver-fix_wsgi/src/ZPublisher/WSGIPublisher.py Import normalization; don't use BBB import names.

[Tres Seaver]

Log message for revision 106829:
  Import normalization;  don't use BBB import names.

Changed:
  U   Zope/branches/tseaver-fix_wsgi/src/ZPublisher/WSGIPublisher.py

-=-
Modified: Zope/branches/tseaver-fix_wsgi/src/ZPublisher/WSGIPublisher.py
===================================================================
--- Zope/branches/tseaver-fix_wsgi/src/ZPublisher/WSGIPublisher.py	2009-12-21 18:52:29 UTC (rev 106828)
+++ Zope/branches/tseaver-fix_wsgi/src/ZPublisher/WSGIPublisher.py	2009-12-21 19:01:51 UTC (rev 106829)
@@ -10,28 +10,29 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__="""Python Object Publisher -- Publish Python objects on web servers
+""" Python Object Publisher -- Publish Python objects on web servers
+"""
+from cStringIO import StringIO
+import re
+import sys
+import time
 
-$Id: Publish.py 67721 2006-04-28 14:57:35Z regebro $"""
-
-import sys, os, re, time
 import transaction
-from Response import Response
-from Request import Request
-from maybe_lock import allocate_lock
-from mapply import mapply
 from zExceptions import Redirect
-from cStringIO import StringIO
 from ZServer.medusa.http_date import build_http_date
+from ZPublisher.HTTPResponse import HTTPResponse
+from ZPublisher.HTTPRequest import HTTPRequest
+from ZPublisher.maybe_lock import allocate_lock
+from ZPublisher.mapply import mapply
 
-class WSGIResponse(Response):
+class WSGIResponse(HTTPResponse):
     """A response object for WSGI
 
     This Response object knows nothing about ZServer, but tries to be
     compatible with the ZServerHTTPResponse. 
     
-    Most significantly, streaming is not (yet) supported."""
-
+    Most significantly, streaming is not (yet) supported.
+    """
     _streaming = 0
     
     def __str__(self,
@@ -271,7 +272,7 @@
     response._http_connection = environ.get('CONNECTION_TYPE', 'close')
     response._server_version = environ['SERVER_SOFTWARE']
 
-    request = Request(environ['wsgi.input'], environ, response)
+    request = HTTPRequest(environ['wsgi.input'], environ, response)
 
     # Let's support post-mortem debugging
     handle_errors = environ.get('wsgi.handleErrors', True)