Changeset 1249

Timestamp:

08/17/06 18:29:23

Author:

fumanchu

Message:

WSGI improvements from Christian's cp3-wsgi-remix branch:

1. cherrypy.Application is now a WSGI callable.
   
2. cherrypy.tree may now be used as a WSGI dispatcher by simply calling it. This replaces the _cpwsgi.wsgiApp function.
   
3. You may now mount arbitrary WSGI apps using tree.graft(wsgi callable, script name).
   
4. If you set an Application object's script_name to None, it will try to pull script_name from cherrypy.request.wsgi_environ['SCRIPT_NAME'].
   

There's a new test_wsgiapps.py (copied from the branch) which helps demonstrate the changes.

Files:

• trunk/cherrypy/__init__.py (modified) (1 diff)
• trunk/cherrypy/_cptree.py (modified) (5 diffs)
• trunk/cherrypy/_cpwsgi.py (modified) (2 diffs)
• trunk/cherrypy/test/benchmark.py (modified) (1 diff)
• trunk/cherrypy/test/helper.py (modified) (2 diffs)
• trunk/cherrypy/test/modpy.py (modified) (1 diff)
• trunk/cherrypy/test/test_response_headers.py (modified) (previous)
• trunk/cherrypy/test/test_tutorials.py (modified) (1 diff)
• trunk/cherrypy/test/test_wsgiapps.py (added)

trunk/cherrypy/__init__.py

@@ -14 +14 @@
-import _cptree
-tree = _cptree.Tree()
+from _cptree import Application
-import _cpengine
-engine = _cpengine.Engine()

trunk/cherrypy/_cptree.py

@@ -2 +2 @@
-import sys
-
-
+
+
-
-
-class Application:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    def __init__(self, root, script_name="", conf=None):
@@ -20 +35 @@
-        if conf:
-            self.merge(conf)
+    
+    def _get_script_name(self):
+        if self._script_name is None:
+            # None signals that the script name should be pulled from WSGI environ.
+            return cherrypy.request.wsgi_environ['SCRIPT_NAME']
+        return self._script_name
+    def _set_script_name(self, value):
+        self._script_name = value
+    script_name = property(_get_script_name, _set_script_name)
-    
-    def merge(self, conf):
@@ -48 +72 @@
-            host += ":%s" % port
-        return scheme + host + self.script_name
+    
+    def __call__(self, environ, start_response):
+        return _cpwsgi._wsgi_callable(environ, start_response, app=self)
-
-
-class Tree:
-
+
+
+
+
+
+
-    
-    def __init__(self):
@@ -72 +104 @@
-        
-        return app
+    
+    def graft(self, wsgi_callable, script_name=""):
+        """Mount a wsgi callable at the given script_name."""
+        # Next line both 1) strips trailing slash and 2) maps "/" -> "".
+        script_name = script_name.rstrip("/")
+        self.apps[script_name] = wsgi_callable
-    
-    def script_name(self, path=None):
@@ -110 +148 @@
-        from cherrypy.lib import http
-        return http.urljoin(script_name, path)
+    
+    def __call__(self, environ, start_response):
+        return _cpwsgi._wsgi_callable(environ, start_response)
-

trunk/cherrypy/_cpwsgi.py

@@ -113 +113 @@
-            yield chunk
-
-def wsgiApp(environ, start_response):
-    """The WSGI 'application object' for CherryPy.
-    
-    Use this as the same WSGI callable for all your CP apps.
-    """
-    return _wsgi_callable(environ, start_response)
-
-def make_app(app):
-    """Factory for making separate WSGI 'application objects' for each CP app.
-    
-    Example:
-        # 'app' will be a CherryPy application object
-        app = cherrypy.tree.mount(Root(), "/", localconf)
-        
-        # 'wsgi_app' will be a WSGI application
-        wsgi_app = _cpwsgi.make_app(app)
-    """
-    def single_app(environ, start_response):
-        return _wsgi_callable(environ, start_response, app)
-    return single_app
-
-
-
-#                            Server components                            #
@@ -197 +175 @@
-                         conf('server.socket_port'))
-        
-        apps = [(base, wsgiApp) for base in cherrypy.tree.apps]
-        
-        s = _cpwsgiserver.CherryPyWSGIServer
-apps
+cherrypy.tree
-                   conf('server.thread_pool'),
-                   conf('server.socket_host'),

trunk/cherrypy/test/benchmark.py

@@ -296 +296 @@
-    PythonFixupHandler cherrypy.test.benchmark::startup_modpython
-    PythonHandler modpython_gateway::handler
-._cpwsgi::wsgiApp
+::tree
-    PythonDebug On
-%s%s

trunk/cherrypy/test/helper.py

@@ -102 +102 @@
-                                        args=(moduleNames, conf))
-
+def sync_apps(profile=False):
+    apps = []
+    for base, app in cherrypy.tree.apps.iteritems():
+        if base == "/":
+            base = ""
+        if profile:
+            apps.append((base, profiler.make_app(app, aggregate=False)))
+        else:
+            apps.append((base, app))
+    apps.sort()
+    apps.reverse()
+    for s in cherrypy.server.httpservers:
+        s.mount_points = apps
+
-def _run_test_suite_thread(moduleNames, conf):
-    from cherrypy import _cpwsgi
-    for testmod in moduleNames:
-        # Must run each module in a separate suite,
@@ -118 +131 @@
-        # The setup functions probably mounted new apps.
-        # Tell our server about them.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        
-        suite = CPTestLoader.loadTestsFromName(testmod)

trunk/cherrypy/test/modpy.py

@@ -62 +62 @@
-PythonOption testmod %s
-PythonHandler modpython_gateway::handler
-._cpwsgi::wsgiApp
+::tree
-PythonDebug On
-"""

trunk/cherrypy/test/test_tutorials.py

@@ -28 +28 @@
-        app.root.sessions = sessions
-        app.root.traceback_setting = traceback_setting
+        
+        helper.sync_apps()
-    load_tut_module.exposed = True
-