Changeset 1597

Timestamp:

01/12/07 06:53:55

Author:

lawouach

Message:

Fixed #641

Files:

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

trunk/cherrypy/_cpdispatch.py

@@ -301 +301 @@
-            if action is not None:
-                handler = getattr(controller, action)
-
+
+
+
+
-        # Do the last path atom here so it can
-        # override the controller's _cp_config.

trunk/cherrypy/test/test_routes.py

@@ -18 +18 @@
-        def index(self, **kwargs):
-            return "Welcome to %s, pop. %s" % (self.name, self.population)
+        index._cp_config = {'tools.response_headers.on': True,
+                            'tools.response_headers.headers': [('Content-Language', 'en-GB')]}
-        
-        def update(self, **kwargs):
-            self.population = kwargs['pop']
-            return "OK"
-
+    
-    d = cherrypy.dispatch.RoutesDispatcher()
-    d.connect(name='hounslow', route='hounslow', controller=City('Hounslow'))
@@ -53 +55 @@
-        self.getPage("/surbiton")
-        self.assertStatus("200 OK")
+        self.assertHeader("Content-Language", "en-GB")
-        self.assertBody("Welcome to Surbiton, pop. 1327")
-
-
-if __name__ == '__main__':