summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-12-16 12:36:10 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-12-16 12:36:10 (GMT)
commitf5ad91c392199fe8fabeed34d1dce6f8be3a0921 (patch)
tree0a8fbf8311bf2a5a15c269ba783ca3f359ad8365
parent755d5ea12aff91dfc4c4fe7302d911da33fffa82 (diff)
parent3d7e11520e5993b2adf9b809a8342084053988ae (diff)
downloadcpython-f5ad91c392199fe8fabeed34d1dce6f8be3a0921.zip
cpython-f5ad91c392199fe8fabeed34d1dce6f8be3a0921.tar.gz
cpython-f5ad91c392199fe8fabeed34d1dce6f8be3a0921.tar.bz2
Issue #19911: ntpath.splitdrive() now correctly processes the 'İ' character
(U+0130, LATIN CAPITAL LETTER I WITH DOT ABOVE).
-rw-r--r--Lib/ntpath.py2
-rw-r--r--Lib/test/test_ntpath.py3
-rw-r--r--Misc/NEWS3
3 files changed, 7 insertions, 1 deletions
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 6b65697..3d9e200 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -204,7 +204,7 @@ def splitdrive(p):
empty = _get_empty(p)
if len(p) > 1:
sep = _get_sep(p)
- normp = normcase(p)
+ normp = p.replace(_get_altsep(p), sep)
if (normp[0:2] == sep*2) and (normp[2:3] != sep):
# is a UNC path:
# vvvvvvvvvvvvvvvvvvvv drive letter or UNC path
diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
index 0991d15..767a5b1 100644
--- a/Lib/test/test_ntpath.py
+++ b/Lib/test/test_ntpath.py
@@ -66,6 +66,9 @@ class TestNtpath(unittest.TestCase):
('', '\\\\conky\\\\mountpoint\\foo\\bar'))
tester('ntpath.splitdrive("//conky//mountpoint/foo/bar")',
('', '//conky//mountpoint/foo/bar'))
+ # Issue #19911: UNC part containing U+0130
+ self.assertEqual(ntpath.splitdrive('//conky/MOUNTPOİNT/foo/bar'),
+ ('//conky/MOUNTPOİNT', '/foo/bar'))
def test_split(self):
tester('ntpath.split("c:\\foo\\bar")', ('c:\\foo', 'bar'))
diff --git a/Misc/NEWS b/Misc/NEWS
index 3819d6c..0ccc45c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -44,6 +44,9 @@ Core and Builtins
Library
-------
+- Issue #19911: ntpath.splitdrive() now correctly processes the 'İ' character
+ (U+0130, LATIN CAPITAL LETTER I WITH DOT ABOVE).
+
- Issue #19532: python -m compileall with no filename/directory arguments now
respects the -f and -q flags instead of ignoring them.