Changeset 1763

Timestamp:

10/26/07 00:44:51

Author:

fumanchu

Message:

Fix for #700 (Deprecate the wsgiapp Tool).

Files:

• trunk/cherrypy/lib/wsgiapp.py (modified) (2 diffs)
• trunk/cherrypy/test/test_wsgiapps.py (modified) (3 diffs)

trunk/cherrypy/lib/wsgiapp.py

@@ -2 +2 @@
-
-import sys
+import warnings
-
-import cherrypy
@@ -51 +52 @@
-def run(app, env=None):
-    """Run the given WSGI app and set response.body to its output."""
+    warnings.warn("This module is deprecated and will be removed in "
+                  "Cherrypy 3.2. See http://www.cherrypy.org/ticket/700 "
+                  "for more information.")
+    
-    try:
-        environ = cherrypy.request.wsgi_environ.copy()

trunk/cherrypy/test/test_wsgiapps.py

@@ -43 +43 @@
-    
-    
-    class HostedWSGI(object):
-        _cp_config = {'tools.wsgiapp.on': True,
-                      'tools.wsgiapp.app': test_app,
-                      }
-    
-    cherrypy.config.update({'environment': 'test_suite'})
-    cherrypy.tree.mount(Root())
-    
-    conf0 = {'/static': {'tools.staticdir.on': True,
-                         'tools.staticdir.root': curdir,
-                         'tools.staticdir.dir': 'static',
-                         }}
-    cherrypy.tree.mount(HostedWSGI(), '/hosted/app0', conf0)
-    cherrypy.tree.graft(test_app, '/hosted/app1')
-    cherrypy.tree.graft(test_empty_string_app, '/hosted/app3')
@@ -67 +57 @@
-
-
-AppTest
+GraftTests
-    
-    wsgi_output = '''Hello, world!
@@ -75 +65 @@
-        self.getPage("/")
-        self.assertBody("I'm a regular CherryPy page handler!")
-    
-    def test_02_wrapped_wsgi(self):
-        self.getPage("/hosted/app0")
-        self.assertHeader("Content-Type", "text/plain")
-        self.assertInBody(self.wsgi_output)
-    
-    def test_03_static_subdir(self):
-        self.getPage("/hosted/app0/static/index.html")
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Type', 'text/html')
-        self.assertBody('Hello, world\r\n')
-    
-    def test_04_pure_wsgi(self):