diff options
| -rw-r--r-- | Lib/lib-stdwin/DirList.py | 13 | ||||
| -rwxr-xr-x | Lib/stdwin/DirList.py | 13 |
2 files changed, 6 insertions, 20 deletions
diff --git a/Lib/lib-stdwin/DirList.py b/Lib/lib-stdwin/DirList.py index 0066c58..00e9a8c 100644 --- a/Lib/lib-stdwin/DirList.py +++ b/Lib/lib-stdwin/DirList.py @@ -2,14 +2,7 @@ # XXX Displays messy paths when following '..' -try: - import posix, path - os = posix -except ImportError: - import mac, macpath - os = mac - path = macpath - +import os import stdwin, rect from stdwinevents import * from Buttons import PushButton @@ -22,8 +15,8 @@ class DirList(VSplit): self = VSplit.create(self, parent) names = os.listdir(dirname) for name in names: - if path.isdir(path.join(dirname, name)): - fullname = path.join(dirname, name) + if os.path.isdir(os.path.join(dirname, name)): + fullname = os.path.join(dirname, name) btn = SubdirButton().definetext(self, fullname) elif name[-3:] == '.py': btn = ModuleButton().definetext(self, name) diff --git a/Lib/stdwin/DirList.py b/Lib/stdwin/DirList.py index 0066c58..00e9a8c 100755 --- a/Lib/stdwin/DirList.py +++ b/Lib/stdwin/DirList.py @@ -2,14 +2,7 @@ # XXX Displays messy paths when following '..' -try: - import posix, path - os = posix -except ImportError: - import mac, macpath - os = mac - path = macpath - +import os import stdwin, rect from stdwinevents import * from Buttons import PushButton @@ -22,8 +15,8 @@ class DirList(VSplit): self = VSplit.create(self, parent) names = os.listdir(dirname) for name in names: - if path.isdir(path.join(dirname, name)): - fullname = path.join(dirname, name) + if os.path.isdir(os.path.join(dirname, name)): + fullname = os.path.join(dirname, name) btn = SubdirButton().definetext(self, fullname) elif name[-3:] == '.py': btn = ModuleButton().definetext(self, name) |