summaryrefslogtreecommitdiff
path: root/cherrypy/test/modpy.py
diff options
context:
space:
mode:
authorRobert Brewer <fumanchu@aminus.org>2006-08-17 23:29:23 +0000
committerRobert Brewer <fumanchu@aminus.org>2006-08-17 23:29:23 +0000
commit5b82f8a579ed4880edd5ea49f0671a230856590a (patch)
tree23b04001cbe552edc71c0b850e992cd967901038 /cherrypy/test/modpy.py
parentacef831e9c3fe7a691b92d7bcf40f12b7fd47b38 (diff)
downloadcherrypy-git-5b82f8a579ed4880edd5ea49f0671a230856590a.tar.gz
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.
Diffstat (limited to 'cherrypy/test/modpy.py')
-rw-r--r--cherrypy/test/modpy.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cherrypy/test/modpy.py b/cherrypy/test/modpy.py
index 421bab9d..b4c45193 100644
--- a/cherrypy/test/modpy.py
+++ b/cherrypy/test/modpy.py
@@ -61,7 +61,7 @@ SetHandler python-program
PythonFixupHandler cherrypy.test.modpy::wsgisetup
PythonOption testmod %s
PythonHandler modpython_gateway::handler
-PythonOption wsgi.application cherrypy._cpwsgi::wsgiApp
+PythonOption wsgi.application cherrypy::tree
PythonDebug On
"""