diff options
| author | Tim Peters <tim.peters@gmail.com> | 2001-11-05 21:25:02 (GMT) |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2001-11-05 21:25:02 (GMT) |
| commit | 6a3e5f14a6038cc524c325dc33e2cb37510e6e4c (patch) | |
| tree | eb259749567ae008eec410e5233aa25fb1c2db5d /Lib | |
| parent | 2a9e3852eeaa3a4d039e2dcedded011dddb612c0 (diff) | |
| download | cpython-6a3e5f14a6038cc524c325dc33e2cb37510e6e4c.zip cpython-6a3e5f14a6038cc524c325dc33e2cb37510e6e4c.tar.gz cpython-6a3e5f14a6038cc524c325dc33e2cb37510e6e4c.tar.bz2 | |
SF bug 478425: Change in os.path.join (ntpath.py)
ntpath.join('a', '') was producing 'a' instead of 'a\\' as in 2.1.
Impossible to guess what was ever *intended*, but since split('a\\')
produces ('a', ''), I think it's best if join('a', '') gives 'a\\' back.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/ntpath.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_ntpath.py | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/Lib/ntpath.py b/Lib/ntpath.py index ed8a2dd..21fadd0 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -82,6 +82,12 @@ def join(a, *p): path += b else: path += "\\" + b + else: + # path is not empty and does not end with a backslash, + # but b is empty; since, e.g., split('a/') produces + # ('a', ''), it's best if join() adds a backslash in + # this case. + path += '\\' return path diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py index 049bbc1..98569f9 100644 --- a/Lib/test/test_ntpath.py +++ b/Lib/test/test_ntpath.py @@ -74,6 +74,14 @@ tester("ntpath.join('c:', 'd:/')", 'd:/') tester("ntpath.join('c:/', 'd:/')", 'd:/') tester("ntpath.join('c:/', 'd:/a/b')", 'd:/a/b') +tester("ntpath.join('')", '') +tester("ntpath.join('', '', '', '', '')", '') +tester("ntpath.join('a')", 'a') +tester("ntpath.join('', 'a')", 'a') +tester("ntpath.join('', '', '', '', 'a')", 'a') +tester("ntpath.join('a', '')", 'a\\') +tester("ntpath.join('a', '', '', '', '')", 'a\\') + tester("ntpath.normpath('A//////././//.//B')", r'A\B') tester("ntpath.normpath('A/./B')", r'A\B') tester("ntpath.normpath('A/foo/../B')", r'A\B') |