mirror of
https://github.com/python/cpython.git
synced 2025-08-28 20:56:54 +00:00
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()
This commit is contained in:
parent
56db16cd44
commit
ba8b0a7db4
1 changed files with 23 additions and 2 deletions
25
Lib/os.py
25
Lib/os.py
|
@ -439,15 +439,36 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
|
||||||
yield top, dirs, nondirs
|
yield top, dirs, nondirs
|
||||||
|
|
||||||
class _DummyDirEntry:
|
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):
|
def __init__(self, dir, name):
|
||||||
self.name = name
|
self.name = name
|
||||||
self.path = path.join(dir, 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):
|
def is_dir(self):
|
||||||
return path.isdir(self.path)
|
stat = self.stat()
|
||||||
|
return st.S_ISDIR(stat.st_mode)
|
||||||
|
|
||||||
def is_symlink(self):
|
def is_symlink(self):
|
||||||
return path.islink(self.path)
|
stat = self.stat()
|
||||||
|
return st.S_ISLNK(stat.st_mode)
|
||||||
|
|
||||||
class _dummy_scandir:
|
class _dummy_scandir:
|
||||||
# listdir-based implementation for bytes patches on Windows
|
# listdir-based implementation for bytes patches on Windows
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue