Patch OSFS.scandir so it properly closes the scandir iterator

Author: althonos

fs/osfs.py

@@ -483,39 +483,44 @@ def _scandir(self, path, namespaces=None):
             else:
                 sys_path = self._to_sys_path(_path)  # type: ignore
             with convert_os_errors("scandir", path, directory=True):
-                for dir_entry in scandir(sys_path):
-                    info = {
-                        "basic": {
-                            "name": fsdecode(dir_entry.name),
-                            "is_dir": dir_entry.is_dir(),
-                        }
-                    }
-                    if "details" in namespaces:
-                        stat_result = dir_entry.stat()
-                        info["details"] = self._make_details_from_stat(stat_result)
-                    if "stat" in namespaces:
-                        stat_result = dir_entry.stat()
-                        info["stat"] = {
-                            k: getattr(stat_result, k)
-                            for k in dir(stat_result)
-                            if k.startswith("st_")
-                        }
-                    if "lstat" in namespaces:
-                        lstat_result = dir_entry.stat(follow_symlinks=False)
-                        info["lstat"] = {
-                            k: getattr(lstat_result, k)
-                            for k in dir(lstat_result)
-                            if k.startswith("st_")
+                scandir_iter = scandir(sys_path)
+                try:
+                    for dir_entry in scandir_iter:
+                        info = {
+                            "basic": {
+                                "name": fsdecode(dir_entry.name),
+                                "is_dir": dir_entry.is_dir(),
+                            }
                         }
-                    if "link" in namespaces:
-                        info["link"] = self._make_link_info(
-                            os.path.join(sys_path, dir_entry.name)
-                        )
-                    if "access" in namespaces:
-                        stat_result = dir_entry.stat()
-                        info["access"] = self._make_access_from_stat(stat_result)
-
-                    yield Info(info)
+                        if "details" in namespaces:
+                            stat_result = dir_entry.stat()
+                            info["details"] = self._make_details_from_stat(stat_result)
+                        if "stat" in namespaces:
+                            stat_result = dir_entry.stat()
+                            info["stat"] = {
+                                k: getattr(stat_result, k)
+                                for k in dir(stat_result)
+                                if k.startswith("st_")
+                            }
+                        if "lstat" in namespaces:
+                            lstat_result = dir_entry.stat(follow_symlinks=False)
+                            info["lstat"] = {
+                                k: getattr(lstat_result, k)
+                                for k in dir(lstat_result)
+                                if k.startswith("st_")
+                            }
+                        if "link" in namespaces:
+                            info["link"] = self._make_link_info(
+                                os.path.join(sys_path, dir_entry.name)
+                            )
+                        if "access" in namespaces:
+                            stat_result = dir_entry.stat()
+                            info["access"] = self._make_access_from_stat(stat_result)
+                            
+                        yield Info(info)
+                finally:
+                    if sys.version_info >= (3, 6):
+                        scandir_iter.close()
 
     else:
 

tests/test_osfs.py

@@ -8,6 +8,7 @@
 import tempfile
 import sys
 import unittest
+import warnings
 
 from fs import osfs, open_fs
 from fs.path import relpath, dirname
@@ -25,6 +26,14 @@
 class TestOSFS(FSTestCases, unittest.TestCase):
     """Test OSFS implementation."""
 
+    @classmethod
+    def setUpClass(cls):
+        warnings.simplefilter("error")
+
+    @classmethod
+    def tearDownClass(cls):
+        warnings.simplefilter(warnings.defaultaction)
+
     def make_fs(self):
         temp_dir = tempfile.mkdtemp("fstestosfs")
         return osfs.OSFS(temp_dir)