Changeset 1309

Timestamp:

09/02/06 02:09:33

Author:

fumanchu

Message:

Moved _wsgi_callable to _cptree, and we now import _cpwsgi as cherrypy.wsgi. Also made App.__call__ route to App.wsgiapp so the latter can be replaced by user code (i.e. it's not a special method).

Files:

• trunk/cherrypy/__init__.py (modified) (1 diff)
• trunk/cherrypy/_cptree.py (modified) (2 diffs)
• trunk/cherrypy/_cpwsgi.py (modified) (4 diffs)

trunk/cherrypy/__init__.py

@@ -16 +16 @@
-tree = _cptree.Tree()
-from cherrypy._cptree import Application
+from cherrypy import _cpwsgi as wsgi
-from cherrypy import _cpengine
-engine = _cpengine.Engine()

trunk/cherrypy/_cptree.py

@@ -1 @@
-
+
+
+
+
+
+
+
-
-
@@ -68 +74 @@
-        return scheme + host + self.script_name
-    
+    def wsgiapp(self, environ, start_response):
+        # This is here instead of __call__ because it's really hard
+        # to overwrite special methods like __call__ per instance.
+        return wsgi_handler(environ, start_response, app=self)
+    
-    def __call__(self, environ, start_response):
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-

trunk/cherrypy/_cpwsgi.py

@@ -1 +1 @@
-"""WSGI interface (see PEP 333)."""
-
-
-
+
-from cherrypy import _cpwsgiserver
-
-
+
-
-
-headerNames = {'HTTP_CGI_AUTHORIZATION': 'Authorization',
-               'CONTENT_LENGTH': 'Content-Length',
-               'CONTENT_TYPE': 'Content-Type',
-               'REMOTE_HOST': 'Remote-Host',
-               'REMOTE_ADDR': 'Remote-Addr',
-               }
-
-def translate_headers(environ):
-    """Translate CGI-environ header names to HTTP header names."""
-    for cgiName in environ:
-        # We assume all incoming header keys are uppercase already.
-        if cgiName in headerNames:
-            yield headerNames[cgiName], environ[cgiName]
-        elif cgiName[:5] == "HTTP_":
-            # Hackish attempt at recovering original header names.
-            translatedHeader = cgiName[5:].replace("_", "-")
-            yield translatedHeader, environ[cgiName]
-
-
-def _wsgi_callable(environ, start_response, app):
-    request = None
-    try:
-        env = environ.get
-        local = http.Host('', int(env('SERVER_PORT', 80)),
-                          env('SERVER_NAME', ''))
-        remote = http.Host(env('REMOTE_ADDR', ''),
-                           int(env('REMOTE_PORT', -1)),
-                           env('REMOTE_HOST', ''))
-        request = cherrypy.engine.request(local, remote,
-                                          env('wsgi.url_scheme'),
-                                          env('ACTUAL_SERVER_PROTOCOL', "HTTP/1.1"))
-        
-        # LOGON_USER is served by IIS, and is the name of the
-        # user after having been mapped to a local account.
-        # Both IIS and Apache set REMOTE_USER, when possible.
-        request.login = env('LOGON_USER') or env('REMOTE_USER') or None
-        
-        request.multithread = environ['wsgi.multithread']
-        request.multiprocess = environ['wsgi.multiprocess']
-        request.wsgi_environ = environ
-        
-        request.app = app
-        
-        path = env('SCRIPT_NAME', '') + env('PATH_INFO', '')
-        response = request.run(environ['REQUEST_METHOD'], path,
-                               env('QUERY_STRING'),
-                               env('SERVER_PROTOCOL'),
-                               translate_headers(environ),
-                               environ['wsgi.input'])
-        s, h, b = response.status, response.header_list, response.body
-        exc = None
-    except (KeyboardInterrupt, SystemExit), ex:
-        try:
-            if request:
-                request.close()
-        except:
-            cherrypy.log(traceback=True)
-        request = None
-        raise ex
-    except:
-        if request and request.throw_errors:
-            raise
-        tb = format_exc()
-        cherrypy.log(tb)
-        if request and not request.show_tracebacks:
-            tb = ""
-        s, h, b = bare_error(tb)
-        exc = sys.exc_info()
-    
-    try:
-        start_response(s, h, exc)
-        for chunk in b:
-            # WSGI requires all data to be of type "str". This coercion should
-            # not take any time at all if chunk is already of type "str".
-            # If it's unicode, it could be a big performance hit (x ~500).
-            if not isinstance(chunk, str):
-                chunk = chunk.encode("ISO-8859-1")
-            yield chunk
-        if request:
-            request.close()
-        request = None
-    except (KeyboardInterrupt, SystemExit), ex:
-        try:
-            if request:
-                request.close()
-        except:
-            cherrypy.log(traceback=True)
-        request = None
-        raise ex
-    except:
-        cherrypy.log(traceback=True)
-        try:
-            if request:
-                request.close()
-        except:
-            cherrypy.log(traceback=True)
-        request = None
-        s, h, b = bare_error()
-        # CherryPy test suite expects bare_error body to be output,
-        # so don't call start_response (which, according to PEP 333,
-        # may raise its own error at that point).
-        for chunk in b:
-            if not isinstance(chunk, str):
-                chunk = chunk.encode("ISO-8859-1")
-            yield chunk
-
-
@@ -121 +13 @@
-    
-    def parse_request(self):
-
+_
-        if mhs > 0:
-
+_
-        
-        try:
-            _cpwsgiserver.HTTPRequest.parse_request(self)
-
+_
-            self.simple_response("413 Request Entity Too Large")
-
+_
-    
-    def decode_chunked(self):
-        """Decode the 'chunked' transfer coding."""
-
+_
-            self.rfile = self.rfile.rfile
-
+_
-        if mbs > 0:
-
+_
-        try:
-            return _cpwsgiserver.HTTPRequest.decode_chunked(self)
-
+_
-            self.simple_response("413 Request Entity Too Large")
-
+_
-            return False
-
@@ -164 +56 @@
-    
-    def __init__(self):
-
+_
-        sockFile = server.socket_file
-        if sockFile:
@@ -174 +66 @@
-        # We could just pass cherrypy.tree, but by passing tree.apps,
-        # we get correct SCRIPT_NAMEs as early as possible.
-
+_
-                   server.thread_pool,
-                   server.socket_host,