[Checkins] SVN: zope.app.wsgi/trunk/ Fixed ``zope.app.wsgi.testlayer.http`` to work with changes made in version 3.11.0.

Michael Howitz mh at gocept.com
Tue Jan 25 04:58:11 EST 2011


Log message for revision 119899:
  Fixed ``zope.app.wsgi.testlayer.http`` to work with changes made in version 3.11.0.
  

Changed:
  U   zope.app.wsgi/trunk/CHANGES.txt
  U   zope.app.wsgi/trunk/src/zope/app/wsgi/testlayer.py

-=-
Modified: zope.app.wsgi/trunk/CHANGES.txt
===================================================================
--- zope.app.wsgi/trunk/CHANGES.txt	2011-01-25 09:52:23 UTC (rev 119898)
+++ zope.app.wsgi/trunk/CHANGES.txt	2011-01-25 09:58:11 UTC (rev 119899)
@@ -3,10 +3,11 @@
 =======
 
 
-3.11.1 (unreleased)
+3.12.0 (unreleased)
 -------------------
 
-- Nothing changed yet.
+- Fixed ``zope.app.wsgi.testlayer.http`` to work with changes made in
+  version 3.11.0.
 
 
 3.11.0 (2011-01-24)

Modified: zope.app.wsgi/trunk/src/zope/app/wsgi/testlayer.py
===================================================================
--- zope.app.wsgi/trunk/src/zope/app/wsgi/testlayer.py	2011-01-25 09:52:23 UTC (rev 119898)
+++ zope.app.wsgi/trunk/src/zope/app/wsgi/testlayer.py	2011-01-25 09:58:11 UTC (rev 119899)
@@ -164,7 +164,8 @@
 
     __str__ = getOutput
 
-
+# XXX seems to only used by tests of zope.app.publication, maybe it should
+# be moved there
 def http(string, handle_errors=True):
     """This function behave like the HTTPCaller of
     zope.app.testing.functional.
@@ -175,8 +176,12 @@
         raise NotInBrowserLayer(NotInBrowserLayer.__doc__)
 
     (app_fn, script_name) = wsgi_intercept._wsgi_intercept[key]
-    app = app_fn(handle_errors=handle_errors)
+    app = app_fn()
 
+    if not string.endswith('\n'):
+        string += '\n'
+    string += 'X-zope-handle-errors: %s\n' % handle_errors
+
     socket = wsgi_intercept.wsgi_fake_socket(app, 'localhost', 80, '')
     socket.sendall(string.lstrip())
     result = socket.makefile()



More information about the checkins mailing list