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

Replace instances of os.path.walk with os.walk

This commit is contained in:
Benjamin Peterson 2008-05-08 22:09:54 +00:00
parent e3b1940eb9
commit 9ec4aa01f9
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/distutils/archive_util.py
View File

@ -95,18 +95,16 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
log.info("creating '%s' and adding '%s' to it",
zip_filename, base_dir)
def visit (z, dirname, names):
for name in names:
path = os.path.normpath(os.path.join(dirname, name))
if os.path.isfile(path):
z.write(path, path)
log.info("adding '%s'" % path)
if not dry_run:
z = zipfile.ZipFile(zip_filename, "w",
compression=zipfile.ZIP_DEFLATED)
os.path.walk(base_dir, visit, z)
for dirpath, dirnames, filenames in os.walk(base_dir):
for name in filenames:
path = os.path.normpath(os.path.join(dirpath, name))
if os.path.isfile(path):
z.write(path, path)
log.info("adding '%s'" % path)
z.close()
return zip_filename

8
Lib/test/test_repr.py
View File

@ -211,10 +211,6 @@ def touch(path, text=''):
fp.write(text)
fp.close()
def zap(actions, dirname, names):
for name in names:
actions.append(os.path.join(dirname, name))
class LongReprTest(unittest.TestCase):
def setUp(self):
longname = 'areallylongpackageandmodulenametotestreprtruncation'
@ -233,7 +229,9 @@ class LongReprTest(unittest.TestCase):
def tearDown(self):
actions = []
os.path.walk(self.pkgname, zap, actions)
for dirpath, dirnames, filenames in os.walk(self.pkgname):
for name in dirnames + filenames:
actions.append(os.path.join(dirpath, name))
actions.append(self.pkgname)
actions.sort()
actions.reverse()