mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Mikael Lyngvig writes:

Browse source 
I just noticed that the changes below also apply to cmpcache.py, which
is virtually identical to cmp.py.
This commit is contained in:
Guido van Rossum 1999-06-25 14:21:44 +00:00
parent 3aa9ca147b
commit 59834f11e3
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/cmpcache.py
View file

@ -22,14 +22,14 @@ cache = {}
# Compare two files, use the cache if possible. # Compare two files, use the cache if possible.
# May raise os.error if a stat or open of either fails. # May raise os.error if a stat or open of either fails.
# #
def cmp(f1, f2): def cmp(f1, f2, shallow=1):
# Return 1 for identical files, 0 for different. # Return 1 for identical files, 0 for different.
# Raise exceptions if either file could not be statted, read, etc. # Raise exceptions if either file could not be statted, read, etc.
s1, s2 = sig(statcache.stat(f1)), sig(statcache.stat(f2)) s1, s2 = sig(statcache.stat(f1)), sig(statcache.stat(f2))
if not S_ISREG(s1[0]) or not S_ISREG(s2[0]): if not S_ISREG(s1[0]) or not S_ISREG(s2[0]):
# Either is a not a plain file -- always report as different # Either is a not a plain file -- always report as different
return 0 return 0
if s1 == s2: if shallow and s1 == s2:
# type, size & mtime match -- report same # type, size & mtime match -- report same
return 1 return 1
if s1[:2] <> s2[:2]: # Types or sizes differ, don't bother if s1[:2] <> s2[:2]: # Types or sizes differ, don't bother
@ -59,8 +59,8 @@ def sig(st):
def do_cmp(f1, f2): def do_cmp(f1, f2):
#print ' cmp', f1, f2 # XXX remove when debugged #print ' cmp', f1, f2 # XXX remove when debugged
bufsize = 8*1024 # Could be tuned bufsize = 8*1024 # Could be tuned
fp1 = open(f1, 'r') fp1 = open(f1, 'rb')
fp2 = open(f2, 'r') fp2 = open(f2, 'rb')
while 1: while 1:
b1 = fp1.read(bufsize) b1 = fp1.read(bufsize)
b2 = fp2.read(bufsize) b2 = fp2.read(bufsize)