summaryrefslogtreecommitdiffstats
path: root/Lib/dircmp.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1991-08-16 13:28:23 (GMT)
committerGuido van Rossum <guido@python.org>1991-08-16 13:28:23 (GMT)
commit784ca6c835b6e872313532b2df482671d7c68916 (patch)
treeb869d480dbabb19bdf57be6da09dda6d8ffc032b /Lib/dircmp.py
parent668317db897185c0cbc2ee97d6344a08d233469c (diff)
downloadcpython-784ca6c835b6e872313532b2df482671d7c68916.zip
cpython-784ca6c835b6e872313532b2df482671d7c68916.tar.gz
cpython-784ca6c835b6e872313532b2df482671d7c68916.tar.bz2
path.cat --> join
Diffstat (limited to 'Lib/dircmp.py')
-rw-r--r--Lib/dircmp.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/dircmp.py b/Lib/dircmp.py
index 819f0bd..60afcdd 100644
--- a/Lib/dircmp.py
+++ b/Lib/dircmp.py
@@ -53,8 +53,8 @@ class dircmp():
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 @@ class dircmp():
# 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 @@ class dircmp():
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