Merge -r 106827-106988 from the tseaver-fix_wsgi branch.

- 100% coverage for 'ZPublisher.HTTPResponse'.

- Stop dancing the status / errmsg into / out of the headers list -- they
  aren't "headers" in any practical sense.

- Conform to PEP 8.

- Normalize imports, avoiding BBB import names.

src/Testing/ZopeTestCase/zopedoctest/functional.py

@@ -185,7 +185,7 @@ def http(request_string, handle_errors=True):
     header_output.setResponseStatus(response.getStatus(), response.errmsg)
     header_output.setResponseHeaders(response.headers)
     header_output.appendResponseHeaders(response._cookie_list())
-    header_output.appendResponseHeaders(response.accumulated_headers.splitlines())
+    header_output.appendResponseHeaders(response.accumulated_headers)
 
     sync()
 

src/ZPublisher/WSGIPublisher.py

@@ -10,28 +10,29 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__="""Python Object Publisher -- Publish Python objects on web servers
-
-$Id: Publish.py 67721 2006-04-28 14:57:35Z regebro $"""
+""" Python Object Publisher -- Publish Python objects on web servers
+"""
+from cStringIO import StringIO
+import re
+import sys
+import time
 
-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 @@ def publish_module_standard(environ, start_response):
     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)

src/ZServer/tests/test_responses.py

@@ -111,7 +111,9 @@ class ZServerHTTPResponseTestCase(unittest.TestCase):
             'Title-Cased': 'bar',
             'mixed-CasED': 'spam',
             'multilined': 'eggs\n\tham'}
-        response.accumulated_headers = 'foo-bar: bar\n\tbaz\nFoo-bar: monty\n'
+        response.accumulated_headers = ['foo-bar: bar',
+                                        '\tbaz',
+                                        'Foo-bar: monty']
         response.cookies = dict(foo=dict(value='bar'))
         response.body = 'A body\nwith multiple lines\n'
         

src/Zope2/utilities/skel/bin/zope2.wsgi.in

+from Zope2.Startup.run import configure
+from Zope2 import startup
+configure('<<INSTANCE_HOME>>/etc/zope.conf')
+startup()
+# mod_wsgi looks for the special name 'application'.
+from ZPublisher.WSGIPublisher import publish_module as application