GH-125413: Add pathlib.Path.dir_entry attribute

Doc/library/pathlib.rst

@@ -1289,6 +1289,29 @@ Reading directories
    raised.
 
 
+.. attribute:: Path.dir_entry
+
+   In a path yielded from :meth:`Path.iterdir`, this attribute stores an
+   :class:`os.DirEntry` object corresponding to the path; in other cases it is
+   ``None``. This can be used to retrieve the file type and attributes of
+   directory children without necessarily incurring further system calls::
+
+      >>> p = Path('docs')
+      >>> for child in p.iterdir():
+      ...     entry = child.dir_entry
+      ...     if entry.is_dir():
+      ...         print(child)
+      ...
+      PosixPath('docs/_templates')
+      PosixPath('docs/_build')
+      PosixPath('docs/_static')
+
+   For technical reasons, this attribute is also available from
+   :class:`PurePath` objects, where its value is always ``None``.
+
+   .. versionadded:: 3.14
+
+
 .. method:: Path.glob(pattern, *, case_sensitive=None, recurse_symlinks=False)
 
    Glob the given relative *pattern* in the directory represented by this path,

Doc/whatsnew/3.14.rst

@@ -343,6 +343,12 @@ pathlib
 
   (Contributed by Barney Gale in :gh:`73991`.)
 
+* Add the :attr:`.Path.dir_entry` attribute. In a path object generated by
+  :meth:`Path.iterdir <pathlib.Path.iterdir>`, it stores an :class:`os.DirEntry`
+  object corresponding to the path; in other cases it is ``None``.
+
+  (Contributed by Barney Gale in :gh:`125413`.)
+
 
 pdb
 ---

Lib/glob.py

@@ -364,12 +364,6 @@ def concat_path(path, text):
         """
         raise NotImplementedError
 
-    @staticmethod
-    def parse_entry(entry):
-        """Returns the path of an entry yielded from scandir().
-        """
-        raise NotImplementedError
-
     # High-level methods
 
     def compile(self, pat):
@@ -438,6 +432,7 @@ def select_wildcard(path, exists=False):
             except OSError:
                 pass
             else:
+                prefix = self.add_slash(path)
                 for entry in entries:
                     if match is None or match(entry.name):
                         if dir_only:
@@ -446,7 +441,7 @@ def select_wildcard(path, exists=False):
                                     continue
                             except OSError:
                                 continue
-                        entry_path = self.parse_entry(entry)
+                        entry_path = self.concat_path(prefix, entry.name)
                         if dir_only:
                             yield from select_next(entry_path, exists=True)
                         else:
@@ -495,6 +490,7 @@ def select_recursive_step(stack, match_pos):
             except OSError:
                 pass
             else:
+                prefix = self.add_slash(path)
                 for entry in entries:
                     is_dir = False
                     try:
@@ -504,7 +500,7 @@ def select_recursive_step(stack, match_pos):
                         pass
 
                     if is_dir or not dir_only:
-                        entry_path = self.parse_entry(entry)
+                        entry_path = self.concat_path(prefix, entry.name)
                         if match is None or match(str(entry_path), match_pos):
                             if dir_only:
                                 yield from select_next(entry_path, exists=True)
@@ -533,7 +529,6 @@ class _StringGlobber(_GlobberBase):
     """
     lexists = staticmethod(os.path.lexists)
     scandir = staticmethod(os.scandir)
-    parse_entry = operator.attrgetter('path')
     concat_path = operator.add
 
     if os.name == 'nt':

Lib/pathlib/_abc.py

@@ -101,18 +101,13 @@ def scandir(path):
         a context manager. This method is called by walk() and glob().
         """
         import contextlib
-        return contextlib.nullcontext(path.iterdir())
+        return contextlib.nullcontext(child.dir_entry for child in path.iterdir())
 
     @staticmethod
     def concat_path(path, text):
         """Appends text to the given path."""
         return path.with_segments(path._raw_path + text)
 
-    @staticmethod
-    def parse_entry(entry):
-        """Returns the path of an entry yielded from scandir()."""
-        return entry
-
 
 class PurePathBase:
     """Base class for pure path objects.
@@ -132,6 +127,12 @@ class PurePathBase:
         # is being processed by `PathBase.resolve()`. This prevents duplicate
         # work from occurring when `resolve()` calls `stat()` or `readlink()`.
         '_resolving',
+
+        # The 'dir_entry' slot stores an `os.DirEntry`-like object or `None`.
+        # It is available for paths generated from `PathBase.iterdir()`. It is
+        # defined here rather than in `PathBase` to avoid a class layout
+        # conflict in `Path`.
+        'dir_entry',
     )
     parser = ParserBase()
     _globber = PathGlobber
@@ -142,6 +143,7 @@ def __init__(self, path, *paths):
             raise TypeError(
                 f"path should be a str, not {type(self._raw_path).__name__!r}")
         self._resolving = False
+        self.dir_entry = None
 
     def with_segments(self, *pathsegments):
         """Construct a new path object from any number of path-like objects.
@@ -696,15 +698,16 @@ def walk(self, top_down=True, on_error=None, follow_symlinks=False):
                 paths.append((path, dirnames, filenames))
             try:
                 for child in path.iterdir():
+                    entry = child.dir_entry
                     try:
-                        if child.is_dir(follow_symlinks=follow_symlinks):
+                        if entry.is_dir(follow_symlinks=follow_symlinks):
                             if not top_down:
                                 paths.append(child)
-                            dirnames.append(child.name)
+                            dirnames.append(entry.name)
                         else:
-                            filenames.append(child.name)
+                            filenames.append(entry.name)
                     except OSError:
-                        filenames.append(child.name)
+                        filenames.append(entry.name)
             except OSError as error:
                 if on_error is not None:
                     on_error(error)
@@ -875,11 +878,12 @@ def copy(self, target, *, follow_symlinks=True, dirs_exist_ok=False,
         stack = [(self, target)]
         while stack:
             src, dst = stack.pop()
-            if not follow_symlinks and src.is_symlink():
+            entry = src.dir_entry or src
+            if not follow_symlinks and entry.is_symlink():
                 dst._symlink_to_target_of(src)
                 if preserve_metadata:
                     src._copy_metadata(dst, follow_symlinks=False)
-            elif src.is_dir():
+            elif entry.is_dir():
                 children = src.iterdir()
                 dst.mkdir(exist_ok=dirs_exist_ok)
                 stack.extend((child, dst.joinpath(child.name))

Lib/pathlib/_local.py

@@ -137,6 +137,7 @@ def __init__(self, *args):
                 paths.append(path)
         # Avoid calling super().__init__, as an optimisation
         self._raw_paths = paths
+        self.dir_entry = None
 
     def joinpath(self, *pathsegments):
         """Combine this path with one or several arguments, and return a
@@ -622,11 +623,12 @@ def iterdir(self):
         special entries '.' and '..' are not included.
         """
         root_dir = str(self)
-        with os.scandir(root_dir) as scandir_it:
-            paths = [entry.path for entry in scandir_it]
-        if root_dir == '.':
-            paths = map(self._remove_leading_dot, paths)
-        return map(self._from_parsed_string, paths)
+        str_attr = 'name' if root_dir == '.' else 'path'
+        def parse(entry):
+            path = self._from_parsed_string(getattr(entry, str_attr))
+            path.dir_entry = entry
+            return path
+        return map(parse, list(os.scandir(root_dir)))
 
     def glob(self, pattern, *, case_sensitive=None, recurse_symlinks=False):
         """Iterate over this subtree and yield all existing files (of any

Lib/pathlib/_os.py

@@ -192,7 +192,8 @@ def read_file_metadata(path, keys=None, *, follow_symlinks=True):
                 if err.errno not in (EPERM, ENOTSUP, ENODATA, EINVAL, EACCES):
                     raise
             continue
-        st = os.stat(path, follow_symlinks=follow_symlinks)
+        entry = path.dir_entry or path
+        st = entry.stat(follow_symlinks=follow_symlinks)
         if key == 'mode':
             result['mode'] = stat.S_IMODE(st.st_mode)
         elif key == 'times_ns':

Lib/test/test_pathlib/test_pathlib_abc.py

@@ -1424,6 +1424,21 @@ def close(self):
     'st_mode st_ino st_dev st_nlink st_uid st_gid st_size st_atime st_mtime st_ctime')
 
 
+class DummyDirEntry:
+    __slots__ = ('name', '_is_symlink', '_is_dir')
+
+    def __init__(self, name, is_symlink, is_dir):
+        self.name = name
+        self._is_symlink = is_symlink
+        self._is_dir = is_dir
+
+    def is_symlink(self):
+        return self._is_symlink
+
+    def is_dir(self, *, follow_symlinks=True):
+        return self._is_dir and (follow_symlinks or not self._is_symlink)
+
+
 class DummyPath(PathBase):
     """
     Simple implementation of PathBase that keeps files and directories in
@@ -1492,13 +1507,22 @@ def open(self, mode='r', buffering=-1, encoding=None,
         return stream
 
     def iterdir(self):
-        path = str(self.resolve())
-        if path in self._files:
-            raise NotADirectoryError(errno.ENOTDIR, "Not a directory", path)
-        elif path in self._directories:
-            return iter([self / name for name in self._directories[path]])
+        path = self.resolve()
+        path_str = str(path)
+        if path_str in self._files:
+            raise NotADirectoryError(errno.ENOTDIR, "Not a directory", path_str)
+        elif path_str in self._directories:
+            return iter([self._make_dir_child(path, name) for name in self._directories[path_str]])
         else:
-            raise FileNotFoundError(errno.ENOENT, "File not found", path)
+            raise FileNotFoundError(errno.ENOENT, "File not found", path_str)
+
+    def _make_dir_child(self, resolved_self, name):
+        path = self.joinpath(name)
+        path_str = str(resolved_self.joinpath(name))
+        is_symlink = path_str in self._symlinks
+        is_directory = path_str in self._directories if not is_symlink else path.is_dir()
+        path.dir_entry = DummyDirEntry(name, is_symlink, is_directory)
+        return path
 
     def mkdir(self, mode=0o777, parents=False, exist_ok=False):
         path = str(self.parent.resolve() / self.name)
@@ -2187,6 +2211,20 @@ def test_iterdir_nodir(self):
         self.assertIn(cm.exception.errno, (errno.ENOTDIR,
                                            errno.ENOENT, errno.EINVAL))
 
+    def test_dir_entry(self):
+        p = self.cls(self.base)
+        self.assertIsNone(p.dir_entry)
+        for child in p.iterdir():
+            entry = child.dir_entry
+            self.assertIsNotNone(entry)
+            self.assertEqual(entry.name, child.name)
+            self.assertEqual(entry.is_symlink(),
+                             child.is_symlink())
+            self.assertEqual(entry.is_dir(follow_symlinks=False),
+                             child.is_dir(follow_symlinks=False))
+            if entry.name != 'brokenLinkLoop':
+                self.assertEqual(entry.is_dir(), child.is_dir())
+
     def test_glob_common(self):
         def _check(glob, expected):
             self.assertEqual(set(glob), { P(self.base, q) for q in expected })

Misc/NEWS.d/next/Library/2024-10-18-04-06-22.gh-issue-125413.EpzLWg.rst

@@ -0,0 +1,4 @@
+Add the :attr:`.Path.dir_entry` attribute. In a path object generated by
+:meth:`Path.iterdir <pathlib.Path.iterdir>`, it stores an
+:class:`os.DirEntry` object corresponding to the path; in other cases it is
+``None``.