Merge branch 'main' into pathlib-fwalk2

python · barneygale · Apr 14, 2023 · May 8, 2023 · May 8, 2023 · May 8, 2023
commit e074ffe4769ba4d752d94210488613a0eaf18009
@@ -349,6 +349,11 @@ inspect
 pathlib
 -------
 
+* Add support for subclassing :class:`pathlib.PurePath` and
+  :class:`~pathlib.Path`, plus their Posix- and Windows-specific variants.
+  Subclasses may override the :meth:`~pathlib.PurePath.with_segments` method
+  to pass information between path instances.
+
 * Add :meth:`~pathlib.Path.walk` and :meth:`~pathlib.Path.fwalk`
   for walking the directory trees and generating all file or directory names
   within them, similar to :func:`os.walk` and :func:`~os.fwalk`.

diff --git a/Lib/pathlib.py b/Lib/pathlib.py
@@ -199,6 +199,24 @@ def _select_from(self, parent_path, scandir):
             return
 
 
+class _DoubleRecursiveWildcardSelector(_RecursiveWildcardSelector):
+    """
+    Like _RecursiveWildcardSelector, but also de-duplicates results from
+    successive selectors. This is necessary if the pattern contains
+    multiple non-adjacent '**' segments.
+    """
+
+    def _select_from(self, parent_path, scandir):
+        yielded = set()
+        try:
+            for p in super()._select_from(parent_path, scandir):
+                if p not in yielded:
+                    yield p
+                    yielded.add(p)
+        finally:
+            yielded.clear()
+
+
 class _WalkAction:
     WALK = object()
     YIELD = object()
@@ -251,6 +269,7 @@ def _walk(top_down, on_error, follow_symlinks, use_fd, actions):
                 on_error(error)
 
 
+
 #
 # Public API
 #