Changeset 1893

Timestamp:

02/18/08 13:17:11

Author:

lawouach

Message:

Test and fix for #706

Files:

• trunk/cherrypy/_cpdispatch.py (modified) (1 diff)
• trunk/cherrypy/test/test_routes.py (modified) (3 diffs)

trunk/cherrypy/_cpdispatch.py

@@ -314 +314 @@
-            action = result.get('action', None)
-            if action is not None:
-
+, None
-                # Get config from the handler 
-                if hasattr(handler, "_cp_config"): 

trunk/cherrypy/test/test_routes.py

@@ -9 +9 @@
-
-def setup_server():
+
+    class Dummy:
+        def index(self):
+            return "I said good day!"
-    
-    class City:
@@ -31 +35 @@
-    d.mapper.connect('surbiton', controller='surbiton',
-                     action='update', conditions=dict(method=['POST']))
+    d.connect('main', ':action', controller=Dummy())
-    
-    conf = {'/': {'request.dispatch': d}}
@@ -45 +50 @@
-        self.assertStatus("200 OK")
-        self.assertBody("Welcome to Hounslow, pop. 10000")
+        
+        self.getPage("/foo")
+        self.assertStatus("404 Not Found")
-        
-        self.getPage("/surbiton")