traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't do truncation to 8+3 format -- this is used on NT file systems!

This commit is contained in:
Guido van Rossum 1996-08-26 16:35:26 +00:00
parent c75db0b7f4
commit 3df7b5a546
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/ntpath.py
View File

@ -312,7 +312,8 @@ def expandvars(path):
# 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.
# Also, components of the path are silently truncated to 8+3 notation. # Previously, this function also truncated pathnames to 8+3 format,
# but as this module is called "ntpath", that's obviously wrong!
def normpath(path): def normpath(path):
path = normcase(path) path = normcase(path)
@ -331,17 +332,9 @@ def normpath(path):
i = i-1 i = i-1
elif comps[i] == '' and i > 0 and comps[i-1] <> '': elif comps[i] == '' and i > 0 and comps[i-1] <> '':
del comps[i] del comps[i]
elif '.' in comps[i]:
comp = string.splitfields(comps[i], '.')
comps[i] = comp[0][:8] + '.' + comp[1][:3]
i = i+1
elif len(comps[i]) > 8:
comps[i] = comps[i][:8]
i = i+1
else: else:
i = i+1 i = i+1
# If the path is now empty, substitute '.' # If the path is now empty, substitute '.'
if not prefix and not comps: if not prefix and not comps:
comps.append('.') comps.append('.')
return prefix + string.joinfields(comps, os.sep) return prefix + string.joinfields(comps, os.sep)