Changeset 1008

Timestamp:

03/15/06 22:06:27

Author:

dowski

Message:

As per the discussion on cherrypy-devel,
the WSGIAppFilter is no longer configurable through the CP config
system. You should either add an instance of
cherrypy.filters.wsgiappfilter.WSGIAppFilter to your _cp_filters
list or use the cherrypy.lib.cptools.WSGIApp convenience class.

Also tweaked the test for wsgiappfilter to make sure that static
content higher than a WSGI application on the tree gets served
correctly.

Files:

• trunk/cherrypy/filters/__init__.py (modified) (1 diff)
• trunk/cherrypy/filters/wsgiappfilter.py (modified) (7 diffs)
• trunk/cherrypy/lib/cptools.py (modified) (2 diffs)
• trunk/cherrypy/test/test_wsgiapp_filter.py (modified) (3 diffs)

trunk/cherrypy/filters/__init__.py

@@ -19 +19 @@
-    "cherrypy.filters.tidyfilter.TidyFilter",
-    "cherrypy.filters.xmlrpcfilter.XmlRpcFilter",
-    "cherrypy.filters.wsgiappfilter.WSGIAppFilter",
-]
-

trunk/cherrypy/filters/wsgiappfilter.py

@@ -1 @@
-
+
+
+
-
-# by Christian Wyglendowski
@@ -7 +9 @@
-import cherrypy
-from cherrypy.filters.basefilter import BaseFilter
-from cherrypy.lib import cptools
-from cherrypy._cputil import get_object_trail
-
-
-class NoWSGIEnvironmentError(Exception):
-    pass
-
-
@@ -54 +51 @@
-    """grabbed some of below from _cpwsgiserver.py
-    
-compatibility with the 2.2beta release of CP
+hosting WSGI apps in non-WSGI environments (yikes!)
-    """
-
@@ -92 +89 @@
-    """A filter for running any WSGI middleware/application within CP.
-
-
-
+
-
-
-
-
-
+
+
+
-
-
-
-
+
+
-    class Whatever:
-        _cp_filters = [WSGIAppFilter(some_app)]
-
-    # using a config file
-    [/hosted/app]
-    wsgiapp_filter.on = True
-    wsgiapp_filter.app = 'package.module.wsgi_app_callable'
-    wsgiapp_filter.env_update = {'running_in_cp':True}
-    """
-
-=None
+
-        self.app = wsgi_app
-        self.env_update = env_update or {}
-   
-    def before_request_body(self):
-        request = cherrypy.request
-        enabled = cherrypy.config.get('wsgiapp_filter.on', False)
-        request.wsgi_app = self.app
-        request.wsgi_env_update = self.env_update
-        request.wsgiapp_filter_on = enabled or bool(self.app)
-
-        if not request.wsgiapp_filter_on:
-            return
-
-        if not request.wsgi_app:
-            app = cherrypy.config.get('wsgiapp_filter.app', None)
-            if app and isinstance(app, basestring):
-                app = cptools.attributes(app)
-            request.wsgi_app = app
-        
-        if not request.wsgi_env_update:
-            env_update = cherrypy.config.get('wsgiapp_filter.env_update', {})
-            request.wsgi_env_update = env_update
-
-        # keep the request body intact so the wsgi app
-        # can have its way with it
@@ -146 +116 @@
-        
-        request = cherrypy.request
-
-        if not request.wsgiapp_filter_on:
-            return
-        
-        # if the static filter is on for this path and
-        # request.execute_main is False, assume that the
@@ -167 +133 @@
-        # update the environ with the dict passed to the filter's
-        # constructor
-request.wsgi_
+self.
-
-        # run the wsgi app and have it set response.body
-request.wsgi_
+self.
-        
-        # tell CP not to handle the request further
-        request.execute_main = False
-
-
-class WSGIApp(object):
-    """a convenience class used to easily mount a wsgi app.
-
-    example:
-    cherrypy.root = SomeRoot()
-    cherrypy.root.otherapp = WSGIApp(other_wsgi_app)
-    """
-    def __init__(self, app, env_update=None):
-        self._cpFilterList = [WSGIAppFilter(app, env_update)]
-
-
@@ -209 +164 @@
-        index.exposed = True
-
+    class HostedWSGI(object):
+        _cp_filters = [WSGIAppFilter(my_app, {'cherrypy.wsgi':True,}),]
+
-    # mount standard CherryPy app
-root = Root(
+tree.mount(Root(), '/'
-    # mount the WSGI app
-
-
+
-
-    cherrypy.server.start()

trunk/cherrypy/lib/cptools.py

@@ -14 +14 @@
-import cherrypy
-import httptools
+
+from cherrypy.filters.wsgiappfilter import WSGIAppFilter
-
-
@@ -234 +236 @@
-
-
+class WSGIApp(object):
+    """a convenience class that uses the WSGIAppFilter
+    
+    to easily add a WSGI application to the CP object tree.
+
+    example:
+    cherrypy.tree.mount(SomeRoot(), '/')
+    cherrypy.tree.mount(WSGIApp(other_wsgi_app), '/ext_app')
+    """
+    def __init__(self, app, env_update=None):
+        self._cpFilterList = [WSGIAppFilter(app, env_update)]
+
+
-# public domain "unrepr" implementation, found on the web and then improved.
-import compiler

trunk/cherrypy/test/test_wsgiapp_filter.py

@@ -2 +2 @@
-test.prefer_parent_path()
-
+import os
+curdir = os.path.join(os.getcwd(), os.path.dirname(__file__))
+
-import cherrypy
-
+
+
-
-def test_app(environ, start_response):
@@ -39 +43 @@
-               'server.socket_port': helper.CPWebCase.PORT,
-               },
-
-
-
-
-
+
+
+
+
+
+
-    })
-
@@ -66 +71 @@
-        self.assertInBody(self.wsgi_output)
-
-from_config_prog
-2
-Header("Content-Type", "text/plain"
-InBody(self.wsgi_output
-InBody("cp.hosted"
-
+static_subdir
+0/static/index.html
+Status('200 OK'
+Header('Content-Type', 'text/html'
+Body('Hello, world\r\n'
+
-if __name__ == '__main__':
-    from cherrypy import _cpwsgi