diff options
author | Charles-François Natali <neologix@free.fr> | 2012-04-22 13:55:43 (GMT) |
---|---|---|
committer | Charles-François Natali <neologix@free.fr> | 2012-04-22 13:55:43 (GMT) |
commit | 84c0ca06d2fe3c773dce722baa5babbdbf73aaa0 (patch) | |
tree | bcbf539a8c638dede417e401ab4facf31685e680 /Lib/os.py | |
parent | 243994dc2180e66c6c062a44a110c702727373ae (diff) | |
download | cpython-84c0ca06d2fe3c773dce722baa5babbdbf73aaa0.zip cpython-84c0ca06d2fe3c773dce722baa5babbdbf73aaa0.tar.gz cpython-84c0ca06d2fe3c773dce722baa5babbdbf73aaa0.tar.bz2 |
Use os.path.samestat() instead of reinventing the wheel.
Diffstat (limited to 'Lib/os.py')
-rw-r--r-- | Lib/os.py | 11 |
1 files changed, 2 insertions, 9 deletions
@@ -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 @@ if _exists("openat"): 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 @@ if _exists("openat"): 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 |