Simplify code slightly

barneygale · barneygale · commit 91b5a78584c1 · 2024-05-30T05:27:49.000+01:00
diff --git a/Lib/os.py b/Lib/os.py
@@ -510,21 +510,21 @@ def _fwalk(stack, isbytes, topdown, onerror, follow_symlinks):
                 name = entry.name
                 if isbytes:
                     name = fsencode(name)
-                is_dir = False
+
                 try:
                     is_dir = entry.is_dir()
-                    if is_dir and not topdown:
-                        # Bottom-up: traverse into sub-directory.
-                        stack.append(
-                            (_fwalk_walk, (
-                                False, topfd, topprefix + name, name,
-                                None if follow_symlinks else entry)))
                 except OSError:
                     # If is_dir() raises an OSError, consider the entry not to
                     # be a directory, same behaviour as os.path.isdir().
-                    pass
+                    is_dir = False
 
                 if is_dir:
+                    if not topdown:
+                        # Bottom-up: traverse into sub-directory.
+                        stack.append(
+                            (_fwalk_walk, (
+                                False, topfd, topprefix + name, name,
+                                None if follow_symlinks else entry)))
                     dirs.append(name)
                 else:
                     nondirs.append(name)
