Apply suggestions from code review

Co-authored-by: Brett Cannon <brett@python.org>
python · barneygale · Mar 22, 2023 · Dec 15, 2022 · Dec 15, 2022 · Dec 15, 2022
commit 49d423711d8d5dff4cede4e70be167056bce7727
@@ -1225,10 +1225,10 @@ def walk(self, top_down=True, on_error=None, follow_symlinks=False):
                continue

            # We may not have read permission for self, in which case we can't
-            # get a list of the files the directory contains. os.walk
-            # always suppressed the exception then, rather than blow up for a
-            # minor reason when (say) a thousand readable directories are still
-            # left to visit. That logic is copied here.
+            # get a list of the files the directory contains. os.walk()
+            # always suppressed the exception in that instance, rather than
+            # blow up for a minor reason when (say) a thousand readable
+            # directories are still left to visit. That logic is copied here.
            try:
                scandir_it = path._scandir()
            except OSError as error:

@@ -2771,11 +2771,14 @@ def test_walk_many_open_files(self):
            path = path / 'd'

    def test_walk_above_recursion_limit(self):
+        recursion_limit = 40
+        # directory_depth > recursion_limit
+        directory_depth = recursion_limit + 10
        base = pathlib.Path(os_helper.TESTFN, 'deep')
-        path = pathlib.Path(base, *(['d']*50))
+        path = pathlib.Path(base, *(['d'] * directory_depth))
        path.mkdir(parents=True)

-        with set_recursion_limit(40):
+        with set_recursion_limit(recursion_limit):
            list(base.walk())
            list(base.walk(top_down=False))