traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renamed path.cat to path.join

This commit is contained in:
Guido van Rossum 1991-08-16 13:14:46 +00:00
parent ca197b520e
commit ac62b9e7cb
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/lib-stdwin/DirList.py
View File

@ -1,5 +1,7 @@
# DirList -- Directory Listing widget # DirList -- Directory Listing widget
# XXX Displays messy paths when following '..'
try: try:
import posix, path import posix, path
os = posix os = posix
@ -20,8 +22,8 @@ class DirList() = VSplit():
self = VSplit.create(self, parent) self = VSplit.create(self, parent)
names = os.listdir(dirname) names = os.listdir(dirname)
for name in names: for name in names:
if path.isdir(path.cat(dirname, name)): if path.isdir(path.join(dirname, name)):
fullname = path.cat(dirname, name) fullname = path.join(dirname, name)
btn = SubdirButton().definetext(self, fullname) btn = SubdirButton().definetext(self, fullname)
elif name[-3:] = '.py': elif name[-3:] = '.py':
btn = ModuleButton().definetext(self, name) btn = ModuleButton().definetext(self, name)

6
Lib/stdwin/DirList.py
View File

@ -1,5 +1,7 @@
# DirList -- Directory Listing widget # DirList -- Directory Listing widget
# XXX Displays messy paths when following '..'
try: try:
import posix, path import posix, path
os = posix os = posix
@ -20,8 +22,8 @@ class DirList() = VSplit():
self = VSplit.create(self, parent) self = VSplit.create(self, parent)
names = os.listdir(dirname) names = os.listdir(dirname)
for name in names: for name in names:
if path.isdir(path.cat(dirname, name)): if path.isdir(path.join(dirname, name)):
fullname = path.cat(dirname, name) fullname = path.join(dirname, name)
btn = SubdirButton().definetext(self, fullname) btn = SubdirButton().definetext(self, fullname)
elif name[-3:] = '.py': elif name[-3:] = '.py':
btn = ModuleButton().definetext(self, name) btn = ModuleButton().definetext(self, name)