Fix Issue11474 - fix url2pathname() handling of '/C|/' on Windows
diff --git a/Lib/nturl2path.py b/Lib/nturl2path.py
index ce9c3d3..511dcec 100644
--- a/Lib/nturl2path.py
+++ b/Lib/nturl2path.py
@@ -27,9 +27,12 @@
drive = comp[0][-1].upper()
components = comp[1].split('/')
path = drive + ':'
- for comp in components:
+ for comp in components:
if comp:
path = path + '\\' + urllib.parse.unquote(comp)
+ # Issue #11474 - handing url such as |c/|
+ if path.endswith(':') and url.endswith('/'):
+ path += '\\'
return path
def pathname2url(p):
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 462a2b0..4d3509a 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -9,6 +9,7 @@
import unittest
from test import support
import os
+import sys
import tempfile
import warnings
@@ -995,6 +996,23 @@
"url2pathname() failed; %s != %s" %
(expect, result))
+ @unittest.skipUnless(sys.platform == 'win32',
+ 'test specific to the urllib.url2path function.')
+ def test_ntpath(self):
+ given = ('/C:/', '///C:/', '/C|//')
+ expect = 'C:\\'
+ for url in given:
+ result = urllib.request.url2pathname(url)
+ self.assertEqual(expect, result,
+ 'urllib.request..url2pathname() failed; %s != %s' %
+ (expect, result))
+ given = '///C|/path'
+ expect = 'C:\\path'
+ result = urllib.request.url2pathname(given)
+ self.assertEqual(expect, result,
+ 'urllib.request.url2pathname() failed; %s != %s' %
+ (expect, result))
+
class Utility_Tests(unittest.TestCase):
"""Testcase to test the various utility functions in the urllib."""