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

Timestamp:

07/07/08 12:32:30 (5 months ago)

Author:

rob

Message:

Quick fix to only allow numeric fragments in file URLs

Files:

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

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

@@ -738 +738 @@
         scheme, authority, path, query, fragment = urlsplit(data)
         
+        # Convenience function to break out the fragment from a file URL.  This
+        # assumes that the only allowed fragments are digits, specifying line
+        # numbers.
+        def find_fragment(path, fragment):
+            if "#" in path:
+                # the fragment is improperly placed in the path
+                path1, fragment1 = path.rsplit("#", 1)
+                if fragment1.isdigit():
+                    return path1, fragment1
+            return path, fragment
+            
         # 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,
@@ -744 +755 @@
             # 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, fragment = find_fragment(path, fragment)
             path = "%s:%s" % (scheme, path)
             scheme = "file"
@@ -755 +764 @@
             drive = path[1].lower()
             path = path[3:]
-            if "#" in path:
-                path, fragment = path.rsplit("#", 1)
+            path, fragment = find_fragment(path, fragment)
             path = "%s:%s" % (drive, path)