summaryrefslogtreecommitdiffstats
path: root/Lib/glob.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/glob.py
parent668317db897185c0cbc2ee97d6344a08d233469c (diff)
downloadcpython-784ca6c835b6e872313532b2df482671d7c68916.zip
cpython-784ca6c835b6e872313532b2df482671d7c68916.tar.gz
cpython-784ca6c835b6e872313532b2df482671d7c68916.tar.bz2
path.cat --> join
Diffstat (limited to 'Lib/glob.py')
-rw-r--r--Lib/glob.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/glob.py b/Lib/glob.py
index 8a70f0e..e29095c 100644
--- a/Lib/glob.py
+++ b/Lib/glob.py
@@ -17,7 +17,7 @@ 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:
@@ -25,7 +25,7 @@ def glob(pathname):
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):