Changeset 1737

Timestamp:

10/04/07 10:47:30

Author:

fumanchu

Message:

Test and fix for #737 (not possible to have custom request handler on application mount point).

Files:

• trunk/cherrypy/_cprequest.py (modified) (1 diff)
• trunk/cherrypy/test/test_objectmapping.py (modified) (3 diffs)

trunk/cherrypy/_cprequest.py

@@ -627 +627 @@
-        # dispatchers can only be specified in app.config, not in _cp_config
-        # (since custom dispatchers may not even have an app.root).
-
+ or "/"
-        while trail:
-            nodeconf = self.app.config.get(trail, {})

trunk/cherrypy/test/test_objectmapping.py

@@ -133 +133 @@
-    Root.collection = Collection()
-    
+    d = cherrypy.dispatch.MethodDispatcher()
-    for url in script_names:
-        d = cherrypy.dispatch.MethodDispatcher()
-        conf = {'/': {'user': (url or "/").split("/")[-2]},
-                '/bymethod': {'request.dispatch': d},
@@ -150 +150 @@
-    
-    cherrypy.tree.mount(Isolated(), "/isolated")
+    
+    class AnotherApp:
+        
+        exposed = True
+        
+        def GET(self):
+            return "milk"
+    
+    cherrypy.tree.mount(AnotherApp(), "/app", {'/': {'request.dispatch': d}})
-
-
@@ -309 +318 @@
-        self.getPage("/collection", method="GET")
-        self.assertBody("['a', 'bit', 'silly']")
+        
+        # Test custom dispatcher set on app root (see #737).
+        self.getPage("/app")
+        self.assertBody("milk")
-
-