mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

path.cat --> join

Browse source
This commit is contained in:
Guido van Rossum 1991-08-16 13:28:23 +00:00
parent 668317db89
commit 784ca6c835
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/dircmp.py
View file

@ -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