summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-12-16 12:34:55 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-12-16 12:34:55 (GMT)
commit3d7e11520e5993b2adf9b809a8342084053988ae (patch)
tree7afaf493934ca1a490aae0379ba55c78c0cf4ca8
parent8a1d1e647eb133cb1687e183dc0aefa7e2f02fdb (diff)
downloadcpython-3d7e11520e5993b2adf9b809a8342084053988ae.zip
cpython-3d7e11520e5993b2adf9b809a8342084053988ae.tar.gz
cpython-3d7e11520e5993b2adf9b809a8342084053988ae.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 826be87..598c64f 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -207,7 +207,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 309d59a..94c57b2 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 73625f3..c5244d3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,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.