Changeset 133

Timestamp:

01/25/05 11:00:48

Author:

cribeiro

Message:

Changed the behavior introduced by ticket #87. It broke some code that relied on getting the unmangled filename on default(). Now it just searches for the objects with the mangled name, but doesnt keep the URL mangled.

Files:

• trunk/cherrypy/_cphttptools.py (modified) (2 diffs)

trunk/cherrypy/_cphttptools.py

@@ -413 +413 @@
-    # Let cpg be the first valid object.
-    validObjects = ["cpg"]
- 
+
-    # Scan the objPathList in order from left to right
-    for index, obj in enumerate(objPathList):
+        # maps virtual filenames to Python identifiers (substitutes '.' for '_')
+        obj = obj.replace('.', '_')
+
-        # currentObjStr holds something like 'cpg.root.something.else'
-        currentObjStr = ".".join(validObjects)
@@ -471 +474 @@
-    if path.endswith('/'): path = path[:-1] # Remove trailing slash
-
-    # So that requests like robots.txt can be handled by a method called  robots_txt
-    path = path.replace('.', '_')
-
-    if not path:
-        objectPathList = []