Commits

Robert Brewer committed c32ac07

Touching up WSGI support for 1.0.1, which we thought was going to be 1.1 but didn't even get a version bump in the protocol's wsgi.version.

Comments (0)

Files changed (2)

cherrypy/_cpserver.py

     """If True (the default since 3.1), sets the TCP_NODELAY socket option."""
     
     wsgi_version = (1, 1)
-    """The WSGI version tuple to use with the builtin WSGI server. The provided
-    options are (1, 0), (1, 1), and ('u', 0) [an experimental unicode version].
+    """The WSGI version tuple to use with the builtin WSGI server.
+    The provided options are (1, 0) [which includes support for PEP 3333,
+    which declares it covers WSGI version 1.0.1 but still mandates the
+    wsgi.version (1, 0)] and ('u', 0), an experimental unicode version.
     You may create and register your own experimental versions of the WSGI
     protocol by adding custom classes to the wsgiserver.wsgi_gateways dict."""
     

cherrypy/wsgiserver/__init__.py

 
 class CherryPyWSGIServer(HTTPServer):
     
-    wsgi_version = (1, 1)
+    wsgi_version = (1, 0)
     
     def __init__(self, bind_addr, wsgi_app, numthreads=10, server_name=None,
                  max=-1, request_queue_size=5, timeout=10, shutdown_timeout=5):
         return env
 
 
-class WSGIGateway_11(WSGIGateway_10):
-    
-    def get_environ(self):
-        env = WSGIGateway_10.get_environ(self)
-        env['wsgi.version'] = (1, 1)
-        return env
-
-
 class WSGIGateway_u0(WSGIGateway_10):
     
     def get_environ(self):
 
 wsgi_gateways = {
     (1, 0): WSGIGateway_10,
-    (1, 1): WSGIGateway_11,
     ('u', 0): WSGIGateway_u0,
 }