path.cat --> join

gvanrossum · gvanrossum · commit 784ca6c835b6 · 1991-08-16T13:28:23.000Z
diff --git a/Lib/dircache.py b/Lib/dircache.py
@@ -32,5 +32,5 @@ def listdir(path): # List directory contents, using cache
 
 def annotate(head, list): # Add '/' suffixes to directories
 	for i in range(len(list)):
-		if path.isdir(path.cat(head, list[i])):
+		if path.isdir(path.join(head, list[i])):
 			list[i] = list[i] + '/'
diff --git a/Lib/dircmp.py b/Lib/dircmp.py
@@ -53,8 +53,8 @@ def phase2(dd): # Distinguish files, directories, funnies
 		dd.common_funny = []
 		#
 		for x in dd.common:
-			a_path = path.cat(dd.a, x)
-			b_path = path.cat(dd.b, x)
+			a_path = path.join(dd.a, x)
+			b_path = path.join(dd.b, x)
 			#
 			ok = 1
 			try:
@@ -92,8 +92,8 @@ def phase4(dd): # Find out differences between common subdirectories
 		# The hide and ignore properties are inherited from the parent
 		dd.subdirs = {}
 		for x in dd.common_dirs:
-			a_x = path.cat(dd.a, x)
-			b_x = path.cat(dd.b, x)
+			a_x = path.join(dd.a, x)
+			b_x = path.join(dd.b, x)
 			dd.subdirs[x] = newdd = dircmp().new(a_x, b_x)
 			newdd.hide = dd.hide
 			newdd.ignore = dd.ignore
@@ -151,7 +151,7 @@ def report_phase4_closure(dd): # Report and do phase 4 recursively
 def cmpfiles(a, b, common):
 	res = ([], [], [])
 	for x in common:
-		res[cmp(path.cat(a, x), path.cat(b, x))].append(x)
+		res[cmp(path.join(a, x), path.join(b, x))].append(x)
 	return res
 
 
diff --git a/Lib/glob.py b/Lib/glob.py
@@ -17,15 +17,15 @@ def glob(pathname):
 		result = []
 		for dirname in list:
 			if basename or path.isdir(dirname):
-				name = path.cat(dirname, basename)
+				name = path.join(dirname, basename)
 				if path.exists(name):
 					result.append(name)
 	else:
 		result = []
 		for dirname in list:
 			sublist = glob1(dirname, basename)
 			for name in sublist:
-				result.append(path.cat(dirname, name))
+				result.append(path.join(dirname, name))
 	return result
 
 def glob1(dirname, pattern):
diff --git a/Lib/lib-stdwin/dirwin.py b/Lib/lib-stdwin/dirwin.py
@@ -11,15 +11,15 @@
 def action(w, string, i, detail):
 	(h, v), clicks, button, mask = detail
 	if clicks = 2:
-		name = path.cat(w.name, string)
+		name = path.join(w.name, string)
 		try:
 			w2 = anywin.open(name)
 			w2.parent = w
 		except posix.error, why:
 			stdwin.message('Can\'t open ' + name + ': ' + why[1])
 
 def open(name):
-	name = path.cat(name, '')
+	name = path.join(name, '')
 	list = dircache.opendir(name)[:]
 	list.sort()
 	dircache.annotate(name, list)
diff --git a/Lib/shutil.py b/Lib/shutil.py
@@ -52,8 +52,8 @@ def copytree(src, dst):
 	dot_dotdot = '.', '..'
 	for name in names:
 		if name not in dot_dotdot:
-			srcname = path.cat(src, name)
-			dstname = path.cat(dst, name)
+			srcname = path.join(src, name)
+			dstname = path.join(dst, name)
 			#print 'Copying', srcname, 'to', dstname
 			try:
 				#if path.islink(srcname):
diff --git a/Lib/stdwin/dirwin.py b/Lib/stdwin/dirwin.py
@@ -11,15 +11,15 @@
 def action(w, string, i, detail):
 	(h, v), clicks, button, mask = detail
 	if clicks = 2:
-		name = path.cat(w.name, string)
+		name = path.join(w.name, string)
 		try:
 			w2 = anywin.open(name)
 			w2.parent = w
 		except posix.error, why:
 			stdwin.message('Can\'t open ' + name + ': ' + why[1])
 
 def open(name):
-	name = path.cat(name, '')
+	name = path.join(name, '')
 	list = dircache.opendir(name)[:]
 	list.sort()
 	dircache.annotate(name, list)
