summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2000-09-19 20:39:32 (GMT)
committerTim Peters <tim.peters@gmail.com>2000-09-19 20:39:32 (GMT)
commit0eeba5b24b0cf5297421c7bd5dbc38aff774dc5f (patch)
treee59a3f89f3f8e46bbd834d760fc7dcc3ef2273c2
parentf5fa0fc640425fd98b1f0178d73e786e20d833cf (diff)
downloadcpython-0eeba5b24b0cf5297421c7bd5dbc38aff774dc5f.zip
cpython-0eeba5b24b0cf5297421c7bd5dbc38aff774dc5f.tar.gz
cpython-0eeba5b24b0cf5297421c7bd5dbc38aff774dc5f.tar.bz2
Part of SF patch 101481: on Windows, os.path.join("a:", "b") should yield
"a:b", not "a:/b". Similar change was made to posixmodule.c earlier.
-rw-r--r--Lib/ntpath.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index aa441bd..c68232b 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -41,7 +41,7 @@ def join(a, *p):
for b in p:
if isabs(b):
path = b
- elif path == '' or path[-1:] in '/\\':
+ elif path == '' or path[-1:] in '/\\:':
path = path + b
else:
path = path + os.sep + b