bpo-39916: Use os.scandir() as context manager in Path.glob(). (GH-18880)

(cherry picked from commit 704e2065f8b8021a4a6999470fb6ed3453f7679e)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

diff --git a/Lib/pathlib.py b/Lib/pathlib.py
index b2cc39857a577d3b44211cc800d8fe54750f8057..f2967492ae8463f817c2adaac7b88b945be5eca2 100644 (file)
--- a/Lib/pathlib.py
+++ b/Lib/pathlib.py
@@ -522,7 +522,8 @@ class _WildcardSelector(_Selector):
 
     def _select_from(self, parent_path, is_dir, exists, scandir):
         try:
-            entries = list(scandir(parent_path))
+            with scandir(parent_path) as scandir_it:
+                entries = list(scandir_it)
             for entry in entries:
                 if self.dironly:
                     try:
@@ -552,7 +553,8 @@ class _RecursiveWildcardSelector(_Selector):
     def _iterate_directories(self, parent_path, is_dir, scandir):
         yield parent_path
         try:
-            entries = list(scandir(parent_path))
+            with scandir(parent_path) as scandir_it:
+                entries = list(scandir_it)
             for entry in entries:
                 entry_is_dir = False
                 try:

diff --git a/Misc/NEWS.d/next/Library/2020-03-09-18-56-27.bpo-39916.BHHyp3.rst b/Misc/NEWS.d/next/Library/2020-03-09-18-56-27.bpo-39916.BHHyp3.rst
new file mode 100644 (file)
index 0000000..5f49062
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-03-09-18-56-27.bpo-39916.BHHyp3.rst
@@ -0,0 +1,2 @@
+More reliable use of ``os.scandir()`` in ``Path.glob()``. It no longer emits
+a ResourceWarning when interrupted.