Changeset 1257 for python

Timestamp:

Nov 17, 2017, 12:15:58 PM (8 years ago)

Author:

dmik

Message:

python: Fix handling drive letters in urllib.url2pathname and pathname2url on OS/2.

It used to use Posix code path that would not recongize drive letters and treat the
path as non-absolute. Fixes Mozilla's python/mozbuild/mozpack/test/test_mozjar.py.

File:

• python/trunk/Lib/urllib.py (modified) (1 diff)

python/trunk/Lib/urllib.py

@@ -50 +50 @@
 elif os.name == 'riscos':
     from rourl2path import url2pathname, pathname2url
+elif os.name == 'os2':
+    import nturl2path
+    def url2pathname(pathname):
+        """OS-specific conversion from a relative URL of the 'file' scheme
+        to a file system path; not recommended for general use."""
+        # nturl2path only expects back slashes
+        return nturl2path.url2pathname(pathname.replace('/', '\\'))
+
+    def pathname2url(pathname):
+        """OS-specific conversion from a file system path to a relative URL
+        of the 'file' scheme; not recommended for general use."""
+        # nturl2path only expects back slashes
+        return nturl2path.pathname2url(pathname.replace('/', '\\'))
 else:
     def url2pathname(pathname):