Changeset 156

Timestamp:

04/24/05 11:04:26

Author:

rdelon

Message:

Fixed ticket #123; now using urlparse.urljoin for concatenating urls; added a test for httptools.redirect()

Files:

• trunk/CHANGELOG.txt (modified) (1 diff)
• trunk/cherrypy/_cphttptools.py (modified) (3 diffs)
• trunk/cherrypy/lib/httptools.py (modified) (1 diff)
• trunk/cherrypy/test/test.py (modified) (1 diff)
• trunk/cherrypy/test/testObjectMapping.py (modified) (3 diffs)

trunk/CHANGELOG.txt

@@ -6 +6 @@
-    * Added DecodingFilter (Remi)
-    * Added form module (port from CP1 Form.cpy) (Remi)
+    * Improved the way static files are being served (Remi)
-
-2004/12-29:

trunk/cherrypy/_cphttptools.py

@@ -28 +28 @@
-
-import cpg, urllib, sys, time, traceback, types, StringIO, cgi, os
-
+, urlparse
-from lib.filter import basefilter
-
@@ -385 +385 @@
-        # For an IndexRedirect, we don't go through the regular
-        #   mechanism: we return the redirect immediately
-canonicalizeUrl(
+urlparse.urljoin(cpg.request.base, 
-        wfile.write('%s 302\r\n' % (cpg.response.headerMap['protocolVersion']))
-        cpg.response.headerMap['Location'] = newUrl
@@ -535 +535 @@
-
-    return candidate, objectPathList, virtualPathList
- 
-def canonicalizeUrl(url):
-    """ Canonicalize a URL. The URL might be relative, absolute or canonical """
-    if not url.startswith('http://') and not url.startswith('https://'):
-        # If url is not canonical, we must make it canonical
-        if url[0] == '/':
-            # URL was absolute: we just add the request.base in front of it
-            url = cpg.request.base + url
-        else:
-            # URL was relative
-            if cpg.request.browserUrl == cpg.request.base:
-                # browserUrl is request.base
-                url = cpg.request.base + '/' + url
-            else:
-                i = cpg.request.browserUrl.rfind('/')
-                url = cpg.request.browserUrl[:i+1] + url
-    return url

trunk/cherrypy/lib/httptools.py

@@ -32 +32 @@
-
-from cherrypy import cpg
+import urlparse
-
-def canonicalizeUrl(url):
-    """ Canonicalize a URL. The URL might be relative, absolute or canonical """
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-def redirect(url):

trunk/cherrypy/test/test.py

@@ -167 +167 @@
-    print "**** THE ABOVE TESTS FAILED"
-    print
-cgi-bin/trac.cgi/
+
-
-else:

trunk/cherrypy/test/testObjectMapping.py

@@ -31 +31 @@
-code = """
-from cherrypy import cpg
+from cherrypy.lib import httptools
-class Root:
-    def index(self, name="world"):
@@ -44 +45 @@
-        return repr(p)
-    extra.exposed = True
+    def redirect(self):
+        return httptools.redirect('dir1/')
+    redirect.exposed = True
-    def notExposed(self):
-        return "not exposed"
@@ -88 +92 @@
-        " and cpg.response.headerMap['Location'] == 'http://127.0.0.1/dir1/dir2/'"),
-    ("/dir1/dir2/dir3/dir4/index", '''cpg.response.body == "default for dir1, param is:('dir2', 'dir3', 'dir4', 'index')"'''),
+    ("/redirect", "cpg.response.headerMap['Status'] == 302" +
+        " and cpg.response.headerMap['Location'] == 'http://127.0.0.1/dir1/'"),
-]
-