#5827: make sure that normpath preserves unicode
This commit is contained in:
parent
58a96efde5
commit
b5689de044
|
@ -397,6 +397,8 @@ def expandvars(path):
|
|||
|
||||
def normpath(path):
|
||||
"""Normalize path, eliminating double slashes, etc."""
|
||||
# Preserve unicode (if path is unicode)
|
||||
backslash, dot = (u'\\', u'.') if isinstance(path, unicode) else ('\\', '.')
|
||||
path = path.replace("/", "\\")
|
||||
prefix, path = splitdrive(path)
|
||||
# We need to be careful here. If the prefix is empty, and the path starts
|
||||
|
@ -411,12 +413,12 @@ def normpath(path):
|
|||
if prefix == '':
|
||||
# No drive letter - preserve initial backslashes
|
||||
while path[:1] == "\\":
|
||||
prefix = prefix + "\\"
|
||||
prefix = prefix + backslash
|
||||
path = path[1:]
|
||||
else:
|
||||
# We have a drive letter - collapse initial backslashes
|
||||
if path.startswith("\\"):
|
||||
prefix = prefix + "\\"
|
||||
prefix = prefix + backslash
|
||||
path = path.lstrip("\\")
|
||||
comps = path.split("\\")
|
||||
i = 0
|
||||
|
@ -435,8 +437,8 @@ def normpath(path):
|
|||
i += 1
|
||||
# If the path is now empty, substitute '.'
|
||||
if not prefix and not comps:
|
||||
comps.append('.')
|
||||
return prefix + "\\".join(comps)
|
||||
comps.append(dot)
|
||||
return prefix + backslash.join(comps)
|
||||
|
||||
|
||||
# Return an absolute path.
|
||||
|
|
|
@ -307,8 +307,10 @@ def expandvars(path):
|
|||
|
||||
def normpath(path):
|
||||
"""Normalize path, eliminating double slashes, etc."""
|
||||
# Preserve unicode (if path is unicode)
|
||||
slash, dot = (u'/', u'.') if isinstance(path, unicode) else ('/', '.')
|
||||
if path == '':
|
||||
return '.'
|
||||
return dot
|
||||
initial_slashes = path.startswith('/')
|
||||
# POSIX allows one or two initial slashes, but treats three or more
|
||||
# as single slash.
|
||||
|
@ -326,10 +328,10 @@ def normpath(path):
|
|||
elif new_comps:
|
||||
new_comps.pop()
|
||||
comps = new_comps
|
||||
path = '/'.join(comps)
|
||||
path = slash.join(comps)
|
||||
if initial_slashes:
|
||||
path = '/'*initial_slashes + path
|
||||
return path or '.'
|
||||
path = slash*initial_slashes + path
|
||||
return path or dot
|
||||
|
||||
|
||||
def abspath(path):
|
||||
|
|
|
@ -123,6 +123,11 @@ class TestNtpath(unittest.TestCase):
|
|||
tester("ntpath.normpath('C:////a/b')", r'C:\a\b')
|
||||
tester("ntpath.normpath('//machine/share//a/b')", r'\\machine\share\a\b')
|
||||
|
||||
# Issue 5827: Make sure normpath preserves unicode
|
||||
for path in (u'', u'.', u'/', u'\\', u'///foo/.//bar//'):
|
||||
self.assertTrue(isinstance(ntpath.normpath(path), unicode),
|
||||
'normpath() returned str instead of unicode')
|
||||
|
||||
def test_expandvars(self):
|
||||
with test_support.EnvironmentVarGuard() as env:
|
||||
env.clear()
|
||||
|
|
|
@ -381,6 +381,11 @@ class PosixPathTest(unittest.TestCase):
|
|||
self.assertEqual(posixpath.normpath("///foo/.//bar//.//..//.//baz"), "/foo/baz")
|
||||
self.assertEqual(posixpath.normpath("///..//./foo/.//bar"), "/foo/bar")
|
||||
|
||||
# Issue 5827: Make sure normpath preserves unicode
|
||||
for path in (u'', u'.', u'/', u'\\', u'///foo/.//bar//'):
|
||||
self.assertTrue(isinstance(posixpath.normpath(path), unicode),
|
||||
'normpath() returned str instead of unicode')
|
||||
|
||||
self.assertRaises(TypeError, posixpath.normpath)
|
||||
|
||||
def test_abspath(self):
|
||||
|
|
|
@ -23,6 +23,9 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #5827: Make sure that normpath preserves unicode. Initial patch
|
||||
by Matt Giuca.
|
||||
|
||||
- Issue #5372: Drop the reuse of .o files in Distutils' ccompiler (since
|
||||
Extension extra options may change the output without changing the .c
|
||||
file). Initial patch by Collin Winter.
|
||||
|
|
Loading…
Reference in New Issue