From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 24 Mar 2016 11:23:18 +0000 (+0100)
Subject: Enhance os._DummyDirEntry
X-Git-Tag: v3.6.0a1~356
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba8b0a7db447fad7a7064e53424725b02ab5ccec;p=python

Enhance os._DummyDirEntry

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()
---

diff --git a/Lib/os.py b/Lib/os.py
index 0ea7b6275f..c3ce05d33b 100644
--- 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