Changeset 2061

Timestamp:

10/31/08 09:25:37

Author:

lakin

Message:

#869 - Don't call exposed dispatch objects for the dispatch step

Files:

• trunk/cherrypy/_cpdispatch.py (modified) (1 diff)
• trunk/cherrypy/test/test_dynamicobjectmapping.py (modified) (1 diff)

trunk/cherrypy/_cpdispatch.py

@@ -238 +238 @@
-            if subnode is None:
-                dispatch = getattr(node, 'dispatch', None)
-
+
+
-                    subnode = dispatch(vpath=iternames)
-            name = iternames.pop(0)

trunk/cherrypy/test/test_dynamicobjectmapping.py

@@ -224 +224 @@
-            self.getPage('/2/2/dispatch')
-            self.assertBody('SubSubRoot dispatch')
+
+            # The exposed dispatch will not be called as a dispatch
+            # method.
+            self.getPage('/2/2/foo/foo')
+            self.assertBody("SubSubRoot default")
-
-            # Dynamic dispatch will fail here for the subsubnodes