mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-30 13:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
fa2f4b6d8e
cpython/Lib/filecmp.py

69 lines
1.5 KiB
Python
Raw Normal View History

More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
"""Compare files."""
New module by Moshe Zadka (submitted on Sept. 25). This unifies the functionality of cmp.py and cmpcache.py, which are hereby declared obsolescent.
1999-10-26 22:02:01 +08:00
More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
import os, stat, statcache
New module by Moshe Zadka (submitted on Sept. 25). This unifies the functionality of cmp.py and cmpcache.py, which are hereby declared obsolescent.
1999-10-26 22:02:01 +08:00
_cache = {}
BUFSIZE=8*1024
More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
def cmp(f1, f2, shallow=1,use_statcache=0):
"""Compare two files.
New module by Moshe Zadka (submitted on Sept. 25). This unifies the functionality of cmp.py and cmpcache.py, which are hereby declared obsolescent.
1999-10-26 22:02:01 +08:00
More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
Arguments:
New module by Moshe Zadka (submitted on Sept. 25). This unifies the functionality of cmp.py and cmpcache.py, which are hereby declared obsolescent.
1999-10-26 22:02:01 +08:00
More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
f1 -- First file name
New module by Moshe Zadka (submitted on Sept. 25). This unifies the functionality of cmp.py and cmpcache.py, which are hereby declared obsolescent.
1999-10-26 22:02:01 +08:00
More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
f2 -- Second file name
New module by Moshe Zadka (submitted on Sept. 25). This unifies the functionality of cmp.py and cmpcache.py, which are hereby declared obsolescent.
1999-10-26 22:02:01 +08:00
More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
shallow -- Just check stat signature (do not read the files).
defaults to 1.
New module by Moshe Zadka (submitted on Sept. 25). This unifies the functionality of cmp.py and cmpcache.py, which are hereby declared obsolescent.
1999-10-26 22:02:01 +08:00
More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
use_statcache -- Do not stat() each file directly: go through
the statcache module for more efficiency.
New module by Moshe Zadka (submitted on Sept. 25). This unifies the functionality of cmp.py and cmpcache.py, which are hereby declared obsolescent.
1999-10-26 22:02:01 +08:00
More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
Return value:
New module by Moshe Zadka (submitted on Sept. 25). This unifies the functionality of cmp.py and cmpcache.py, which are hereby declared obsolescent.
1999-10-26 22:02:01 +08:00
More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
integer -- 1 if the files are the same, 0 otherwise.
New module by Moshe Zadka (submitted on Sept. 25). This unifies the functionality of cmp.py and cmpcache.py, which are hereby declared obsolescent.
1999-10-26 22:02:01 +08:00
More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
This function uses a cache for past comparisons and the results,
with a cache invalidation mechanism relying on stale signatures.
Of course, if 'use_statcache' is true, this mechanism is defeated,
and the cache will never grow stale.
New module by Moshe Zadka (submitted on Sept. 25). This unifies the functionality of cmp.py and cmpcache.py, which are hereby declared obsolescent.
1999-10-26 22:02:01 +08:00
More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
"""
Fredrik Lundh: The new filecmp module has an optional argument called use_statcache which is documented as a true/false value, but used as an tuple index. This patches replaces the tuple stuff with a good old if- statement, and also removes a few other tuple pack/unpack constructs (if not else, this saves a few bytes in the PYC file, and a few microseconds when using the module ;-).
2000-03-29 05:42:38 +08:00
if use_statcache:
stat_function = statcache.stat
else:
stat_function = os.stat
s1 = _sig(stat_function(f1))
s2 = _sig(stat_function(f2))
if s1[0] != stat.S_IFREG or s2[0] != stat.S_IFREG:
return 0
if shallow and s1 == s2:
return 1
if s1[1] != s2[1]:
return 0
New module by Moshe Zadka (submitted on Sept. 25). This unifies the functionality of cmp.py and cmpcache.py, which are hereby declared obsolescent.
1999-10-26 22:02:01 +08:00
More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
result = _cache.get((f1, f2))
Fredrik Lundh: The new filecmp module has an optional argument called use_statcache which is documented as a true/false value, but used as an tuple index. This patches replaces the tuple stuff with a good old if- statement, and also removes a few other tuple pack/unpack constructs (if not else, this saves a few bytes in the PYC file, and a few microseconds when using the module ;-).
2000-03-29 05:42:38 +08:00
if result and (s1, s2) == result[:2]:
More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
return result[2]
outcome = _do_cmp(f1, f2)
_cache[f1, f2] = s1, s2, outcome
return outcome
New module by Moshe Zadka (submitted on Sept. 25). This unifies the functionality of cmp.py and cmpcache.py, which are hereby declared obsolescent.
1999-10-26 22:02:01 +08:00
def _sig(st):
More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
return (stat.S_IFMT(st[stat.ST_MODE]),
st[stat.ST_SIZE],
st[stat.ST_MTIME])
New module by Moshe Zadka (submitted on Sept. 25). This unifies the functionality of cmp.py and cmpcache.py, which are hereby declared obsolescent.
1999-10-26 22:02:01 +08:00
def _do_cmp(f1, f2):
More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
bufsize = BUFSIZE
Fredrik Lundh: The new filecmp module has an optional argument called use_statcache which is documented as a true/false value, but used as an tuple index. This patches replaces the tuple stuff with a good old if- statement, and also removes a few other tuple pack/unpack constructs (if not else, this saves a few bytes in the PYC file, and a few microseconds when using the module ;-).
2000-03-29 05:42:38 +08:00
fp1 = open(f1, 'rb')
fp2 = open(f2, 'rb')
More trivial comment -> docstring transformations by Ka-Ping Yee, who writes: Here is batch 2, as a big collection of CVS context diffs. Along with moving comments into docstrings, i've added a couple of missing docstrings and attempted to make sure more module docstrings begin with a one-line summary. I did not add docstrings to the methods in profile.py for fear of upsetting any careful optimizations there, though i did move class documentation into class docstrings. The convention i'm using is to leave credits/version/copyright type of stuff in # comments, and move the rest of the descriptive stuff about module usage into module docstrings. Hope this is okay.
2000-02-04 23:10:34 +08:00
while 1:
Fredrik Lundh: The new filecmp module has an optional argument called use_statcache which is documented as a true/false value, but used as an tuple index. This patches replaces the tuple stuff with a good old if- statement, and also removes a few other tuple pack/unpack constructs (if not else, this saves a few bytes in the PYC file, and a few microseconds when using the module ;-).
2000-03-29 05:42:38 +08:00
b1 = fp1.read(bufsize)
b2 = fp2.read(bufsize)
if b1 != b2:
return 0
if not b1:
return 1
Reference in New Issue Copy Permalink