Changeset 561

Timestamp:

08/27/05 12:32:59

Author:

fumanchu

Message:

1. Partial fix for #248; the request path is now %XX-decoded as soon as possible (was in mapPathToObject). This means config sections can now be decoded, as well (e.g. you should now write path instead of /this%20path).
2. Changeset [559] broke logging test--fixed.

Files:

• trunk/cherrypy/_cphttptools.py (modified) (2 diffs)
• trunk/cherrypy/test/test_core.py (modified) (5 diffs)
• trunk/cherrypy/test/test_objectmapping.py (modified) (1 diff)

trunk/cherrypy/_cphttptools.py

@@ -258 +258 @@
-            path, req.queryString = path, ""
-        
-
+
+
+
+
+
-        if path == "*":
+            # "...the request does not apply to a particular resource,
+            # but to the server itself". See
+            # http://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5.1.2
-            path = "global"
-        elif not path.startswith("/"):
@@ -851 +858 @@
-    # Remove leading and trailing slash
-    tpath = path.strip("/")
-    # Replace quoted chars (eg %20) from url
-    tpath = urllib.unquote(tpath)
-    
-    if not tpath:

trunk/cherrypy/test/test_core.py

@@ -67 +67 @@
-    def ismap(self, x, y):
-        return "Coordinates: %s, %s" % (x, y)
+    
+    def default(self, *args, **kwargs):
+        return "args: %s kwargs: %s" % (args, kwargs)
-
-
@@ -267 +270 @@
-        'server.logAccessFile': logAccessFile,
-    },
+    '/params': {
+        'server.logFile': logFile,
+    },
-})
-
@@ -311 +317 @@
-            ignore.pop()
-        
+        # Test "% HEX HEX"-encoded URL, param keys, and values
+        self.getPage("/params/%e3/cheese?Gruy%E8re=Bulgn%e9ville")
+        self.assertBody(r"args: ('\xe3', 'cheese') "
+                        r"kwargs: {'Gruy\xe8re': 'Bulgn\xe9ville'}")
+        
+        # Make sure that encoded = and & get parsed correctly
+        self.getPage("/params/code?url=http%3A//cherrypy.org/index%3Fa%3D1%26b%3D2")
+        self.assertBody(r"args: ('code',) "
+                        r"kwargs: {'url': 'http://cherrypy.org/index?a=1&b=2'}")
+        
-        # Test coordinates sent by <img ismap>
-        self.getPage("/params/ismap?223,114")
@@ -347 +363 @@
-        self.assertBody('content')
-        self.assertStatus('200 OK')
-        
-        data = open(logFile, "rb").readlines()
-        self.assertEqual(data[0][-55:], ' HTTP INFO 127.0.0.1 - GET /flatten/as_string HTTP/1.1\n')
-        self.assertEqual(data[1][-54:], ' HTTP INFO 127.0.0.1 - GET /flatten/as_yield HTTP/1.1\n')
-        
-        data = open(logAccessFile, "rb").readlines()
@@ -372 +384 @@
-        else:
-            self.assertEqual(data[1][-41:], '] "GET /flatten/as_yield HTTP/1.1" 200 -\n')
+        
+        data = open(logFile, "rb").readlines()
+        self.assertEqual(data, [])
+        
+        # Test that error log gets access messages if no logAccess defined.
+        self.getPage("/params/?thing=a")
+        self.assertBody("'a'")
+        data = open(logFile, "rb").readlines()
+        self.assertEqual(data[0][-53:], ' HTTP INFO 127.0.0.1 - GET /params/?thing=a HTTP/1.1\n')
-    
-    def testRedirect(self):

trunk/cherrypy/test/test_objectmapping.py

@@ -144 +144 @@
-        
-        # Test that we can use URL's which aren't all valid Python identifiers
-
+
+
-        self.assertBody("ID is 14")
-