Skip to content

C
cpython
Kaydet (Commit) aa257d90 authored tarafından Guido van Rossum's avatar Guido van Rossum
Dosyalara gözat
Seçenekler

use os and os.path

üst bf1710ac
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 20 deletions
Lib/lib-stdwin/DirList.py
Dosyayı görüntüle @ aa257d90
...@@ -2,14 +2,7 @@ ...@@ -2,14 +2,7 @@
# XXX Displays messy paths when following '..' # XXX Displays messy paths when following '..'
try: import os
import posix, path
os = posix
except ImportError:
import mac, macpath
os = mac
path = macpath
import stdwin, rect import stdwin, rect
from stdwinevents import * from stdwinevents import *
from Buttons import PushButton from Buttons import PushButton
...@@ -22,8 +15,8 @@ class DirList(VSplit): ...@@ -22,8 +15,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.join(dirname, name)): if os.path.isdir(os.path.join(dirname, name)):
fullname = path.join(dirname, name) fullname = os.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)
......
Lib/stdwin/DirList.py
Dosyayı görüntüle @ aa257d90
...@@ -2,14 +2,7 @@ ...@@ -2,14 +2,7 @@
# XXX Displays messy paths when following '..' # XXX Displays messy paths when following '..'
try: import os
import posix, path
os = posix
except ImportError:
import mac, macpath
os = mac
path = macpath
import stdwin, rect import stdwin, rect
from stdwinevents import * from stdwinevents import *
from Buttons import PushButton from Buttons import PushButton
...@@ -22,8 +15,8 @@ class DirList(VSplit): ...@@ -22,8 +15,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.join(dirname, name)): if os.path.isdir(os.path.join(dirname, name)):
fullname = path.join(dirname, name) fullname = os.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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment