mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

SF bug #456621: normpath on Win32 not collapsing c:\\..

Browse source 
I actually rewrote normpath quite a bit:  it had no test cases, and as
soon as I starting writing some I found several cases that didn't make
sense.
This commit is contained in:
Tim Peters 2001-08-30 22:05:26 +00:00
parent 0e03f588f5
commit 54a14a373e
2 changed files with 35 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Lib/ntpath.py
View file

@ -407,7 +407,7 @@ def expandvars(path):
return res
# Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A/B.
# Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A\B.
# Previously, this function also truncated pathnames to 8+3 format,
# but as this module is called "ntpath", that's obviously wrong!
@ -421,15 +421,18 @@ def normpath(path):
comps = path.split("\\")
i = 0
while i < len(comps):
if comps[i] == '.':
del comps[i]
elif comps[i] == '..' and i > 0 and comps[i-1] not in ('', '..'):
del comps[i-1:i+1]
i = i - 1
elif comps[i] == '' and i > 0 and comps[i-1] != '':
if comps[i] in ('.', ''):
del comps[i]
elif comps[i] == '..':
if i > 0 and comps[i-1] != '..':
del comps[i-1:i+1]
i -= 1
elif i == 0 and prefix.endswith("\\"):
del comps[i]
else:
i += 1
else:
i = i + 1
i += 1
# If the path is now empty, substitute '.'
if not prefix and not comps:
comps.append('.')