From: Barney Gale <barney.gale@gmail.com>
Date: Sat, 2 Sep 2023 15:08:03 +0000 (+0100)
Subject: GH-78722: Raise exceptions from `pathlib.Path.iterdir()` without delay. (#107320)
X-Git-Tag: v3.13.0a1~644
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bdc3c884cdc90102ad68b6b55dc9b988e729ae35;p=thirdparty%2FPython%2Fcpython.git

GH-78722: Raise exceptions from `pathlib.Path.iterdir()` without delay. (#107320)

`pathlib.Path.iterdir()` now immediately raises any `OSError`
exception from `os.listdir()`, rather than waiting until its
result is iterated over.
---

diff --git a/Lib/pathlib.py b/Lib/pathlib.py
index 758f70f5ba70..f4ec315da6b4 100644
--- a/Lib/pathlib.py
+++ b/Lib/pathlib.py
@@ -1009,8 +1009,7 @@ class Path(PurePath):
         The children are yielded in arbitrary order, and the
         special entries '.' and '..' are not included.
         """
-        for name in os.listdir(self):
-            yield self._make_child_relpath(name)
+        return (self._make_child_relpath(name) for name in os.listdir(self))
 
     def _scandir(self):
         # bpo-24132: a future version of pathlib will support subclassing of
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index 74deec84336f..09df3fe471fc 100644
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -1766,7 +1766,7 @@ class PathTest(unittest.TestCase):
         # __iter__ on something that is not a directory.
         p = self.cls(BASE, 'fileA')
         with self.assertRaises(OSError) as cm:
-            next(p.iterdir())
+            p.iterdir()
         # ENOENT or EINVAL under Windows, ENOTDIR otherwise
         # (see issue #12802).
         self.assertIn(cm.exception.errno, (errno.ENOTDIR,
diff --git a/Misc/NEWS.d/next/Library/2023-07-26-22-52-48.gh-issue-78722.6SKBLt.rst b/Misc/NEWS.d/next/Library/2023-07-26-22-52-48.gh-issue-78722.6SKBLt.rst
new file mode 100644
index 000000000000..aea26ee2f994
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-07-26-22-52-48.gh-issue-78722.6SKBLt.rst
@@ -0,0 +1,2 @@
+Fix issue where :meth:`pathlib.Path.iterdir` did not raise :exc:`OSError`
+until iterated.