[Checkins] SVN: gocept.selenium/trunk/src/gocept/selenium/ moved CleanerMiddleware into code for better reuse

[Michael Howitz]

Log message for revision 122814:
  moved CleanerMiddleware into code for better reuse
  

Changed:
  U   gocept.selenium/trunk/src/gocept/selenium/README.txt
  U   gocept.selenium/trunk/src/gocept/selenium/wsgi/__init__.py

-=-
Modified: gocept.selenium/trunk/src/gocept/selenium/README.txt
===================================================================
--- gocept.selenium/trunk/src/gocept/selenium/README.txt	2011-09-15 06:08:23 UTC (rev 122813)
+++ gocept.selenium/trunk/src/gocept/selenium/README.txt	2011-09-15 06:58:08 UTC (rev 122814)
@@ -45,33 +45,18 @@
 Quick start for WSGI applications (Zope 2)
 ------------------------------------------
 
-When running Zope 2 as WSGI application you might need the following
-additional middleware around your WSGI application::
+When running Zope 2 as WSGI application you might see the following
+exception when running tests::
 
-    class CleanerMiddleware(object):
-        """Fix problems between WSGI server and middlewares."""
+  File ".../repoze.retry-1.0-py2.7.egg/repoze/retry/__init__.py", line 55, in __call__
+    cl = int(cl)
+   ValueError: invalid literal for int() with base 10: ''
 
-        def __init__(self, app):
-            self.app = app
+To fix it you can use an additional middleware around your WSGI
+application: ``gocept.selenium.wsgi.CleanerMiddleware``. It also fixes an
+issue with ``wsgiref``. See comments in the code for more information.
 
-        def __call__(self, environ, start_response):
-            # wsgiref.simple_server.ServerHandler.setup_environ adds
-            # 'CONTENT_LENGTH' key to environ which has the value '', but
-            # repoze.retry.Retry.__call__ 1.0. expects the value to be
-            # convertable to `int` See http://bugs.repoze.org/issue171.
-            if environ.get('CONTENT_LENGTH') == '':
-                del environ['CONTENT_LENGTH']
 
-            # gocept.selenium uses wsgiref but
-            # wsgiref.simple_server.ServerHandler.start_response bails when it
-            # sees the 'Connection' header, so we frankly remove it here:
-            def clean_start_response(status, headers, exc_info):
-                headers = [(k, v) for (k, v) in headers if k != 'Connection']
-                return start_response(status, headers, exc_info)
-
-            return self.app(environ, clean_start_response)
-
-
 Quick start with ZTK (zope.app.testing)
 ---------------------------------------
 

Modified: gocept.selenium/trunk/src/gocept/selenium/wsgi/__init__.py
===================================================================
--- gocept.selenium/trunk/src/gocept/selenium/wsgi/__init__.py	2011-09-15 06:08:23 UTC (rev 122813)
+++ gocept.selenium/trunk/src/gocept/selenium/wsgi/__init__.py	2011-09-15 06:58:08 UTC (rev 122814)
@@ -62,3 +62,27 @@
 
 class TestCase(gocept.selenium.base.TestCase, unittest.TestCase):
     pass
+
+
+class CleanerMiddleware(object):
+    """Fix problems between WSGI server and middlewares."""
+
+    def __init__(self, app):
+        self.app = app
+
+    def __call__(self, environ, start_response):
+        # wsgiref.simple_server.ServerHandler.setup_environ adds
+        # 'CONTENT_LENGTH' key to environ which has the value '', but
+        # repoze.retry.Retry.__call__ 1.0. expects the value to be
+        # convertable to `int` See http://bugs.repoze.org/issue171.
+        if environ.get('CONTENT_LENGTH') == '':
+            del environ['CONTENT_LENGTH']
+
+        # gocept.selenium uses wsgiref but
+        # wsgiref.simple_server.ServerHandler.start_response bails when it
+        # sees the 'Connection' header, so we frankly remove it here:
+        def clean_start_response(status, headers, exc_info):
+            headers = [(k, v) for (k, v) in headers if k != 'Connection']
+            return start_response(status, headers, exc_info)
+
+        return self.app(environ, clean_start_response)