summaryrefslogtreecommitdiffstats
path: root/Lib/ntpath.py
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2001-11-05 21:25:02 (GMT)
committerTim Peters <tim.peters@gmail.com>2001-11-05 21:25:02 (GMT)
commit6a3e5f14a6038cc524c325dc33e2cb37510e6e4c (patch)
treeeb259749567ae008eec410e5233aa25fb1c2db5d /Lib/ntpath.py
parent2a9e3852eeaa3a4d039e2dcedded011dddb612c0 (diff)
downloadcpython-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/ntpath.py')
-rw-r--r--Lib/ntpath.py6
1 files changed, 6 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