Changeset 1768

Timestamp:

10/26/07 20:44:31

Author:

fumanchu

Message:

Docs and new url() test.

Files:

• trunk/cherrypy/__init__.py (modified) (1 diff)
• trunk/cherrypy/_cprequest.py (modified) (1 diff)
• trunk/cherrypy/test/test_core.py (modified) (2 diffs)

trunk/cherrypy/__init__.py

@@ -493 +493 @@
-        newurl = '/'.join(atoms)
-    
+    # At this point, we should have a fully-qualified absolute URL.
+    
-    if relative:
-        old = url().split('/')[:-1]

trunk/cherrypy/_cprequest.py

@@ -326 +326 @@
-    The default 'None' implies that no authentication happened."""
-    
+    # Note that cherrypy.url uses "if request.app:" to determine whether
+    # the call is during a real HTTP request or not. So leave this None.
-    app = None
-    app__doc = \

trunk/cherrypy/test/test_core.py

@@ -50 +50 @@
-            return "Size: %s" % len(file.file.read())
-        upload.exposed = True
+        
+        def baseurl(self, path_info, relative=None):
+            return cherrypy.url(path_info, relative=bool(relative))
+        baseurl.exposed = True
-    
-    root = Root()
@@ -1066 +1070 @@
-        self.getPage('/url/?path_info=other/../page1&relative=True')
-        self.assertBody('page1')
+        
+        # Output relative to /
+        self.getPage('/baseurl?path_info=ab&relative=True')
+        self.assertBody('ab')
+        # Output relative to /
+        self.getPage('/baseurl?path_info=/ab&relative=True')
+        self.assertBody('ab')
-
-