Changeset 1462 for trunk/peppy/vfs/itools/uri/generic.py

Timestamp:

07/07/08 07:41:10 (5 months ago)

Author:

rob

Message:

Fixed vfs uri handling to properly decode fragments in windows path urls
* makeTabActive now attempts to match on normalized URLs
* added testcase for windows urls with fragments

Files:

• trunk/peppy/vfs/itools/uri/generic.py (modified) (2 diffs)

trunk/peppy/vfs/itools/uri/generic.py

@@ -738 +738 @@
         scheme, authority, path, query, fragment = urlsplit(data)
         
-        # Some special cases for Windows paths
+        # Some special cases for Windows paths c:/a/b#4 and file:///c:/a/b#4.
+        # urlsplit has problems with the scheme, leading slashes in the path,
+        # and doesn't split out the fragment properly
         if len(scheme) == 1:
             # found a windows drive name instead of path, because urlsplit
             # thinks the scheme is "c" for Windows paths like "c:/a/b"
+            if "#" in path:
+                # the fragment is improperly placed in the path
+                path, fragment = path.rsplit("#", 1)
             path = "%s:%s" % (scheme, path)
             scheme = "file"
@@ -748 +753 @@
             # like "file:///c:/a/b" -- it thinks the path is "/c:/a/b", which
             # to be correct requires removing the leading slash.
-            path = "%s:%s" % (path[1].lower(), path[3:])
+            drive = path[1].lower()
+            path = path[3:]
+            if "#" in path:
+                path, fragment = path.rsplit("#", 1)
+            path = "%s:%s" % (drive, path)
         
         # The path