]> granicus.if.org Git - python/commitdiff
Enhance os._DummyDirEntry
authorVictor Stinner <victor.stinner@gmail.com>
Thu, 24 Mar 2016 11:23:18 +0000 (12:23 +0100)
committerVictor Stinner <victor.stinner@gmail.com>
Thu, 24 Mar 2016 11:23:18 +0000 (12:23 +0100)
Issue #25911:

* Try to fix test_os.BytesWalkTests on Windows
* Try to mimick better the reference os.DirEntry on Windows
* _DummyDirEntry now caches os.stat() result
* _DummyDirEntry constructor now tries to get os.stat()

Lib/os.py

index 0ea7b6275fd49779c1bb21a8bf8b2bb4bb063c99..c3ce05d33be08ca31c7a96b45dfa91cfcce6784e 100644 (file)
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -439,15 +439,36 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
         yield top, dirs, nondirs
 
 class _DummyDirEntry:
+    """Dummy implementation of DirEntry
+
+    Only used internally by os.walk(bytes). Since os.walk() doesn't need the
+    follow_symlinks parameter: don't implement it, always follow symbolic
+    links.
+    """
+
     def __init__(self, dir, name):
         self.name = name
         self.path = path.join(dir, name)
+        # Mimick FindFirstFile/FindNextFile: we should get file attributes
+        # while iterating on a directory
+        self._stat = None
+        try:
+            self.stat()
+        except OSError:
+            pass
+
+    def stat(self):
+        if self._stat is None:
+            self._stat = stat(self.path)
+        return self._stat
 
     def is_dir(self):
-        return path.isdir(self.path)
+        stat = self.stat()
+        return st.S_ISDIR(stat.st_mode)
 
     def is_symlink(self):
-        return path.islink(self.path)
+        stat = self.stat()
+        return st.S_ISLNK(stat.st_mode)
 
 class _dummy_scandir:
     # listdir-based implementation for bytes patches on Windows