From: Guido van Rossum <guido@python.org>
Date: Tue, 7 Oct 1997 14:48:23 +0000 (+0000)
Subject: Fix join to support multiple arguments.
X-Git-Tag: v1.5a4~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae590db3ce8cd583f1f14fbb498f45d095b6d262;p=thirdparty%2FPython%2Fcpython.git

Fix join to support multiple arguments.
(Why isn't this file identical to ntpath.py?)
---

diff --git a/Lib/dospath.py b/Lib/dospath.py
index 725b38149520..73e6377b4f86 100644
--- a/Lib/dospath.py
+++ b/Lib/dospath.py
@@ -35,15 +35,18 @@ def isabs(s):
 	return s != '' and s[:1] in '/\\'
 
 
-# Join two pathnames.
-# Ignore the first part if the second part is absolute.
-# Insert a '/' unless the first part is empty or already ends in '/'.
-
-def join(a, b):
-	if isabs(b): return b
-	if a == '' or a[-1:] in '/\\': return a + b
-	# Note: join('x', '') returns 'x/'; is this what we want?
-	return a + os.sep + b
+# Join two (or more) paths.
+
+def join(a, *p):
+	path = a
+	for b in p:
+		if isabs(b):
+			path = b
+		elif path == '' or path[-1:] in '/\\':
+			path = path + b
+		else:
+			path = path + os.sep + b
+	return path
 
 
 # Split a path in a drive specification (a drive letter followed by a