Code review fixes

miss-islington · Jul 22, 2022 · May 8, 2022 · May 9, 2022 · May 9, 2022 · May 9, 2022
commit e8ea6ba0a9b2c7d7ba05b68a75771892aa11aea3
@@ -963,15 +963,15 @@ call fails (for example because the path doesn't exist).
    ``dirpath / name``. Whether or not the lists are sorted is file
    system-dependent.
 
-   If optional argument *top_down* is ``True`` or not specified, the triple for a
+   If optional argument *top_down* is true or not specified, the triple for a
    directory is generated before the triples for any of its subdirectories
    (directories are walked top-down).  If *top_down* is ``False``, the triple
    for a directory is generated after the triples for all of its subdirectories
    (directories are walked bottom-up). No matter the value of *top_down*, the
    list of subdirectories is retrieved before the tuples for the directory and
    its subdirectories are walked.
 
-   When *top_down* is ``True``, the caller can modify the *dirnames* list in-place
+   When *top_down* is true, the caller can modify the *dirnames* list in-place
    (For example, using :keyword:`del` or slice assignment), and :meth:`Path.walk`
    will only recurse into the subdirectories whose names remain in *dirnames*;
    this can be used to prune the search, or to impose a specific order of visiting,
@@ -988,13 +988,13 @@ call fails (for example because the path doesn't exist).
    filename is available as the ``filename`` attribute of the exception object.
 
    By default, :meth:`Path.walk` does not follow symbolic links, and instead adds them
-   to the *filenames* list. Set *follow_symlinks* to ``True`` to resolve symlinks
+   to the *filenames* list. Set *follow_symlinks* to true to resolve symlinks
    and place them in *dirnames* and *filenames* as appropriate for their targets, and
    consequently visit directories pointed to by symlinks (where supported).
 
    .. note::
 
-      Be aware that setting *follow_symlinks* to ``True`` can lead to infinite
+      Be aware that setting *follow_symlinks* to true can lead to infinite
       recursion if a link points to a parent directory of itself. :meth:`Path.walk`
       does not keep track of the directories it has already visited.
 

diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
@@ -2489,14 +2489,8 @@ class WalkTests(unittest.TestCase):
     testing a bit more complex cases than Path's setup.
     """
 
-    # Wrapper to hide minor differences between different implementations
-    # of Path.walk (for example, Path.fwalk)
-    def walk(self, top, **kwargs):
-        return top.walk(**kwargs)
-
     def setUp(self):
         P = pathlib.Path
-        join = os.path.join
         self.addCleanup(os_helper.rmtree, os_helper.TESTFN)
 
         # Build:
@@ -2569,7 +2563,7 @@ def setUp(self):
     def test_walk_topdown(self):
         # Walk top-down.
         P = pathlib.Path
-        all = list(self.walk(self.walk_path))
+        all = list(self.walk_path.walk())
 
         self.assertEqual(len(all), 4)
         # We can't know which order SUB1 and SUB2 will appear in.
@@ -2589,7 +2583,7 @@ def test_walk_prune(self, walk_path=None):
             walk_path = self.walk_path
         # Prune the search.
         all = []
-        for root, dirs, files in self.walk(walk_path):
+        for root, dirs, files in walk_path.walk():
             all.append((root, dirs, files))
             # Don't descend into SUB1.
             if 'SUB1' in dirs:
@@ -2608,7 +2602,7 @@ def test_file_like_path(self):
 
     def test_walk_bottom_up(self):
         # Walk bottom-up.
-        all = list(self.walk(self.walk_path, top_down=False))
+        all = list(self.walk_path.walk( top_down=False))
 
         self.assertEqual(len(all), 4, all)
         # We can't know which order SUB1 and SUB2 will appear in.
@@ -2630,7 +2624,7 @@ def test_walk_bottom_up(self):
     @os_helper.skip_unless_symlink
     def test_walk_follow_symlinks(self):
         # Walk, following symlinks.
-        walk_it = self.walk(self.walk_path, follow_symlinks=True)
+        walk_it = self.walk_path.walk(follow_symlinks=True)
         for root, dirs, files in walk_it:
             if root == self.link_path:
                 self.assertEqual(dirs, [])
@@ -2643,13 +2637,13 @@ def test_walk_symlink_location(self):
         """ Tests whether symlinks end up in filenames or dirnames depending
         on the `follow_symlinks` argument
         """
-        walk_it = self.walk(self.walk_path, follow_symlinks=False)
+        walk_it = self.walk_path.walk(follow_symlinks=False)
         for root, dirs, files in walk_it:
             if root == self.sub2_path:
                 self.assertIn("link", files)
                 break
 
-        walk_it = self.walk(self.walk_path, follow_symlinks=True)
+        walk_it = self.walk_path.walk(follow_symlinks=True)
         for root, dirs, files in walk_it:
             if root == self.sub2_path:
                 self.assertIn("link", dirs)
@@ -2658,7 +2652,7 @@ def test_walk_symlink_location(self):
     def test_walk_bad_dir(self):
         # Walk top-down.
         errors = []
-        walk_it = self.walk(self.walk_path, on_error=errors.append)
+        walk_it = self.walk_path.walk(on_error=errors.append)
         root, dirs, files = next(walk_it)
         self.assertEqual(errors, [])
         dir1 = 'SUB1'
@@ -2683,14 +2677,14 @@ def test_walk_many_open_files(self):
         p = P(base, *(['d']*depth))
         p.mkdir(parents=True)
 
-        iters = [self.walk(base, top_down=False) for _ in range(100)]
+        iters = [base.walk(top_down=False) for _ in range(100)]
         for i in range(depth + 1):
             expected = (p, ['d'] if i else [], [])
             for it in iters:
                 self.assertEqual(next(it), expected)
             p = p.parent
 
-        iters = [self.walk(base, top_down=True) for _ in range(100)]
+        iters = [base.walk(top_down=True) for _ in range(100)]
         p = base
         for i in range(depth + 1):
             expected = (p, ['d'] if i < depth else [], [])