Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-03 22:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use os.path.samestat() instead of reinventing the wheel.

Browse source
This commit is contained in:
Charles-François Natali 2012-04-22 15:55:43 +02:00
parent 243994dc21
commit 84c0ca06d2
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/os.py
View file

@ -126,13 +126,6 @@ def _get_masked_mode(mode):
umask(mask)
return mode & ~mask
def _are_same_file(stat1, stat2):
"""Helper function that checks whether two stat results refer to the same
file.
"""
return (stat1.st_ino == stat2.st_ino and stat1.st_dev == stat2.st_dev)
#
# Super directory utilities.
# (Inspired by Eric Raymond; the doc strings are mostly his)
@ -345,7 +338,7 @@ def fwalk(top, topdown=True, onerror=None, followlinks=False):
topfd = open(top, O_RDONLY)
try:
if (followlinks or (st.S_ISDIR(orig_st.st_mode) and
_are_same_file(orig_st, fstat(topfd)))):
path.samestat(orig_st, fstat(topfd)))):
for x in _fwalk(topfd, top, topdown, onerror, followlinks):
yield x
finally:
@ -382,7 +375,7 @@ def _fwalk(topfd, toppath, topdown, onerror, followlinks):
onerror(err)
return
try:
if followlinks or _are_same_file(orig_st, fstat(dirfd)):
if followlinks or path.samestat(orig_st, fstat(dirfd)):
dirpath = path.join(toppath, name)
for x in _fwalk(dirfd, dirpath, topdown, onerror, followlinks):
yield x