Changeset 1496

Timestamp:

12/09/06 16:59:31

Author:

fumanchu

Message:

2.x Fix for #507 (InternalRedirect?? supports only absolute paths). Paths relative to request.path are now possible by omitting the leading slash from the path.

Files:

• branches/cherrypy-2.x/cherrypy/_cperror.py (modified) (3 diffs)
• branches/cherrypy-2.x/cherrypy/test/test_core.py (modified) (2 diffs)

branches/cherrypy-2.x/cherrypy/_cperror.py

@@ -2 +2 @@
-
-import urllib
+import urlparse
+
-
-class Error(Exception):
@@ -33 +35 @@
-        import cgi
-        request = cherrypy.request
+        
+        # Note that urljoin will "do the right thing" whether url is:
+        #  1. a URL relative to root (e.g. "/dummy")
+        #  2. a URL relative to the current path
+        # Note that any querystring will be discarded.
+        path = urlparse.urljoin(cherrypy.request.path, path)
-        
-        # Set a 'path' member attribute so that code which traps this
@@ -66 +74 @@
-    
-    def __init__(self, urls, status=None):
-        import urlparse
-        import cherrypy
-        

branches/cherrypy-2.x/cherrypy/test/test_core.py

@@ -141 +141 @@
-        def index(self):
-            raise cherrypy.InternalRedirect("/")
+        
+        def relative(self):
+            raise cherrypy.InternalRedirect("cousin")
+        
+        def cousin(self):
+            return "I am a redirected page."
-        
-        def petshop(self, user_id):
@@ -573 +579 @@
-        self.assertBody('Please log in')
-        self.assertStatus(200)
+        self.assertStatus(200)
+        
+        # Relative path in InternalRedirect
+        self.getPage("/internalredirect/relative")
+        self.assertBody('I am a redirected page.')
-        
-        # HTTPRedirect on error