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

diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py
index a9c6a5b488f2f9a28a5bf4beddfc090b62be690e..264e66faf2171309556d5d681aa731df95a9d00f 100644 (file)
--- a/Lib/distutils/archive_util.py
+++ b/Lib/distutils/archive_util.py
@@ -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

diff --git a/Lib/test/test_repr.py b/Lib/test/test_repr.py
index 6284f4095a0f404dbb3ff6850839725e9721e0ac..1094816ae609fc9f1a489f356d9ceeec770ebe60 100644 (file)
--- a/Lib/test/test_repr.py
+++ b/Lib/test/test_repr.py
@@ -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()