Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Change ntpath.join() so that join("d:/", "/whatever") returns 

d:/whatever instead of /whatever.  While I'm afraid changing isabs()
to be *consistent* with this would break lots of code, it makes
best sense for join() to do it this way.  Thanks to Alex Martelli for
pushing back on this one!
This commit is contained in:
Tim Peters 2001-07-26 21:54:37 +00:00
parent 76f373d081
commit 4223f89edd
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/ntpath.py
View File

@ -42,11 +42,12 @@ def join(a, *p):
"""Join two or more pathname components, inserting "\\" as needed""" """Join two or more pathname components, inserting "\\" as needed"""
path = a path = a
for b in p: for b in p:
# If path is a raw drive letter (e.g. "C:"), and b doesn't start # If path starts with a raw drive letter (e.g. "C:"), and b doesn't
# with a drive letter, path+b is correct, and regardless of whether # start with a drive letter, path+b is correct, and regardless of\
# b is absolute on its own. # whether b is absolute on its own.
if len(path) == 2 and path[-1] == ":" and splitdrive(b)[0] == "": if len(path) >= 2 and path[1] == ":" and splitdrive(b)[0] == "":
pass if path[-1] in "/\\" and b[:1] in "/\\":
b = b[1:]
# In any other case, if b is absolute it wipes out the path so far. # In any other case, if b is absolute it wipes out the path so far.
elif isabs(b) or path == "": elif isabs(b) or path == "":

1
Lib/test/test_ntpath.py
View File

@ -65,6 +65,7 @@ tester('ntpath.join("a", "b", "c")', 'a\\b\\c')
tester('ntpath.join("a\\", "b", "c")', 'a\\b\\c') tester('ntpath.join("a\\", "b", "c")', 'a\\b\\c')
tester('ntpath.join("a", "b\\", "c")', 'a\\b\\c') tester('ntpath.join("a", "b\\", "c")', 'a\\b\\c')
tester('ntpath.join("a", "b", "\\c")', '\\c') tester('ntpath.join("a", "b", "\\c")', '\\c')
tester('ntpath.join("d:\\", "\\pleep")', 'd:\\pleep')
if errors: if errors:
raise TestFailed(str(errors) + " errors.") raise TestFailed(str(errors) + " errors.")