Changeset 391 for python/trunk/Lib/nturl2path.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/nturl2path.py (modified) (1 diff)

python/trunk/Lib/nturl2path.py

@@ -26 +26 @@
         raise IOError, error
     drive = comp[0][-1].upper()
+    path = drive + ':'
     components = comp[1].split('/')
-    path = drive + ':'
-    for  comp in components:
+    for comp in components:
         if comp:
             path = path + '\\' + urllib.unquote(comp)
+    # Issue #11474: url like '/C|/' should convert into 'C:\\'
+    if path.endswith(':') and url.endswith('/'):
+        path += '\\'
     return path