cpython-lru_cache-weakref: Lib/filecmp.py annotate

annotate Lib/filecmp.py @ 39042:c02fa187e0f4 legacy-trunk

Part of SF patch #1484695. This removes dead code. The chksum was already verified in .frombuf() on the lines above. If there was a problem an exception is raised, so there was no way this condition could have been true.

author	Neal Norwitz <nnorwitz@gmail.com>
date	Mon, 10 Jul 2006 00:23:17 +0000
parents	cf555ec698eb
children	82717b84888e

rev	line source
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	1 """Utilities for comparing files and directories.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	2
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	3 Classes:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	4 dircmp
11411 24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	5
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	6 Functions:
27731 c1ecdde32f86 Add DeprecationWarning when use_statcache argument is supplied Andrew M. Kuchling <amk@amk.ca> parents: 27724 diff changeset	7 cmp(f1, f2, shallow=1) -> int
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	8 cmpfiles(a, b, common) -> ([], [], [])
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	9
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	10 """
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	11
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	12 import os
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	13 import stat
27731 c1ecdde32f86 Add DeprecationWarning when use_statcache argument is supplied Andrew M. Kuchling <amk@amk.ca> parents: 27724 diff changeset	14 import warnings
30286 22502f795b49 SF bug #453515: filecmp.dircmp case sensitivity bug Raymond Hettinger <python@rcn.com> parents: 28084 diff changeset	15 from itertools import ifilter, ifilterfalse, imap, izip
11411 24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	16
16072 bae889f44cd1 more __all__ updates Skip Montanaro <skip@pobox.com> parents: 15867 diff changeset	17 __all__ = ["cmp","dircmp","cmpfiles"]
bae889f44cd1 more __all__ updates Skip Montanaro <skip@pobox.com> parents: 15867 diff changeset	18
11411 24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	19 _cache = {}
24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	20 BUFSIZE=8*1024
24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	21
34096 cf555ec698eb Removed deprecated use_statcache argument. Raymond Hettinger <python@rcn.com> parents: 30286 diff changeset	22 def cmp(f1, f2, shallow=1):
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	23 """Compare two files.
11411 24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	24
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	25 Arguments:
11411 24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	26
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	27 f1 -- First file name
11411 24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	28
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	29 f2 -- Second file name
11411 24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	30
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	31 shallow -- Just check stat signature (do not read the files).
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	32 defaults to 1.
11411 24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	33
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	34 Return value:
11411 24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	35
22830 a9dd5e6d6805 Convert a pile of obvious "yes/no" functions to return bool. Tim Peters <tim.peters@gmail.com> parents: 16072 diff changeset	36 True if the files are the same, False otherwise.
11411 24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	37
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	38 This function uses a cache for past comparisons and the results,
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	39 with a cache invalidation mechanism relying on stale signatures.
11411 24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	40
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	41 """
27731 c1ecdde32f86 Add DeprecationWarning when use_statcache argument is supplied Andrew M. Kuchling <amk@amk.ca> parents: 27724 diff changeset	42
27724 3982f117679e [Bug #680494] filecmp.py uses obsolete statcache module. Andrew M. Kuchling <amk@amk.ca> parents: 23634 diff changeset	43 s1 = _sig(os.stat(f1))
3982f117679e [Bug #680494] filecmp.py uses obsolete statcache module. Andrew M. Kuchling <amk@amk.ca> parents: 23634 diff changeset	44 s2 = _sig(os.stat(f2))
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	45 if s1[0] != stat.S_IFREG or s2[0] != stat.S_IFREG:
22830 a9dd5e6d6805 Convert a pile of obvious "yes/no" functions to return bool. Tim Peters <tim.peters@gmail.com> parents: 16072 diff changeset	46 return False
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	47 if shallow and s1 == s2:
22830 a9dd5e6d6805 Convert a pile of obvious "yes/no" functions to return bool. Tim Peters <tim.peters@gmail.com> parents: 16072 diff changeset	48 return True
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	49 if s1[1] != s2[1]:
22830 a9dd5e6d6805 Convert a pile of obvious "yes/no" functions to return bool. Tim Peters <tim.peters@gmail.com> parents: 16072 diff changeset	50 return False
11411 24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	51
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	52 result = _cache.get((f1, f2))
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	53 if result and (s1, s2) == result[:2]:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	54 return result[2]
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	55 outcome = _do_cmp(f1, f2)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	56 _cache[f1, f2] = s1, s2, outcome
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	57 return outcome
11411 24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	58
24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	59 def _sig(st):
23625 65cf478950ff Replaced obsolete stat module constants with equivalent attributes Raymond Hettinger <python@rcn.com> parents: 22830 diff changeset	60 return (stat.S_IFMT(st.st_mode),
65cf478950ff Replaced obsolete stat module constants with equivalent attributes Raymond Hettinger <python@rcn.com> parents: 22830 diff changeset	61 st.st_size,
65cf478950ff Replaced obsolete stat module constants with equivalent attributes Raymond Hettinger <python@rcn.com> parents: 22830 diff changeset	62 st.st_mtime)
11411 24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	63
24138ec3f396 New module by Moshe Zadka (submitted on Sept. 25). This unifies the Guido van Rossum <guido@python.org> parents: diff changeset	64 def _do_cmp(f1, f2):
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	65 bufsize = BUFSIZE
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	66 fp1 = open(f1, 'rb')
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	67 fp2 = open(f2, 'rb')
28084 44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	68 while True:
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	69 b1 = fp1.read(bufsize)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	70 b2 = fp2.read(bufsize)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	71 if b1 != b2:
28084 44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	72 return False
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	73 if not b1:
28084 44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	74 return True
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	75
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	76 # Directory comparison class.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	77 #
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	78 class dircmp:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	79 """A class that manages the comparison of 2 directories.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	80
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	81 dircmp(a,b,ignore=None,hide=None)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	82 A and B are directories.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	83 IGNORE is a list of names to ignore,
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	84 defaults to ['RCS', 'CVS', 'tags'].
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	85 HIDE is a list of names to hide,
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	86 defaults to [os.curdir, os.pardir].
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	87
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	88 High level usage:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	89 x = dircmp(dir1, dir2)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	90 x.report() -> prints a report on the differences between dir1 and dir2
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	91 or
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	92 x.report_partial_closure() -> prints report on differences between dir1
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	93 and dir2, and reports on common immediate subdirectories.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	94 x.report_full_closure() -> like report_partial_closure,
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	95 but fully recursive.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	96
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	97 Attributes:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	98 left_list, right_list: The files in dir1 and dir2,
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	99 filtered by hide and ignore.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	100 common: a list of names in both dir1 and dir2.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	101 left_only, right_only: names only in dir1, dir2.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	102 common_dirs: subdirectories in both dir1 and dir2.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	103 common_files: files in both dir1 and dir2.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	104 common_funny: names in both dir1 and dir2 where the type differs between
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	105 dir1 and dir2, or the name is not stat-able.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	106 same_files: list of identical files.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	107 diff_files: list of filenames which differ.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	108 funny_files: list of files which could not be compared.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	109 subdirs: a dictionary of dircmp objects, keyed by names in common_dirs.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	110 """
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	111
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	112 def __init__(self, a, b, ignore=None, hide=None): # Initialize
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	113 self.left = a
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	114 self.right = b
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	115 if hide is None:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	116 self.hide = [os.curdir, os.pardir] # Names never to be shown
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	117 else:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	118 self.hide = hide
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	119 if ignore is None:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	120 self.ignore = ['RCS', 'CVS', 'tags'] # Names ignored in comparison
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	121 else:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	122 self.ignore = ignore
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	123
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	124 def phase0(self): # Compare everything except common subdirectories
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	125 self.left_list = _filter(os.listdir(self.left),
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	126 self.hide+self.ignore)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	127 self.right_list = _filter(os.listdir(self.right),
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	128 self.hide+self.ignore)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	129 self.left_list.sort()
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	130 self.right_list.sort()
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	131
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	132 def phase1(self): # Compute common names
30286 22502f795b49 SF bug #453515: filecmp.dircmp case sensitivity bug Raymond Hettinger <python@rcn.com> parents: 28084 diff changeset	133 a = dict(izip(imap(os.path.normcase, self.left_list), self.left_list))
22502f795b49 SF bug #453515: filecmp.dircmp case sensitivity bug Raymond Hettinger <python@rcn.com> parents: 28084 diff changeset	134 b = dict(izip(imap(os.path.normcase, self.right_list), self.right_list))
22502f795b49 SF bug #453515: filecmp.dircmp case sensitivity bug Raymond Hettinger <python@rcn.com> parents: 28084 diff changeset	135 self.common = map(a.__getitem__, ifilter(b.has_key, a))
22502f795b49 SF bug #453515: filecmp.dircmp case sensitivity bug Raymond Hettinger <python@rcn.com> parents: 28084 diff changeset	136 self.left_only = map(a.__getitem__, ifilterfalse(b.has_key, a))
22502f795b49 SF bug #453515: filecmp.dircmp case sensitivity bug Raymond Hettinger <python@rcn.com> parents: 28084 diff changeset	137 self.right_only = map(b.__getitem__, ifilterfalse(a.has_key, b))
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	138
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	139 def phase2(self): # Distinguish files, directories, funnies
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	140 self.common_dirs = []
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	141 self.common_files = []
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	142 self.common_funny = []
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	143
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	144 for x in self.common:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	145 a_path = os.path.join(self.left, x)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	146 b_path = os.path.join(self.right, x)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	147
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	148 ok = 1
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	149 try:
27724 3982f117679e [Bug #680494] filecmp.py uses obsolete statcache module. Andrew M. Kuchling <amk@amk.ca> parents: 23634 diff changeset	150 a_stat = os.stat(a_path)
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	151 except os.error, why:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	152 # print 'Can\'t stat', a_path, ':', why[1]
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	153 ok = 0
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	154 try:
27724 3982f117679e [Bug #680494] filecmp.py uses obsolete statcache module. Andrew M. Kuchling <amk@amk.ca> parents: 23634 diff changeset	155 b_stat = os.stat(b_path)
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	156 except os.error, why:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	157 # print 'Can\'t stat', b_path, ':', why[1]
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	158 ok = 0
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	159
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	160 if ok:
23625 65cf478950ff Replaced obsolete stat module constants with equivalent attributes Raymond Hettinger <python@rcn.com> parents: 22830 diff changeset	161 a_type = stat.S_IFMT(a_stat.st_mode)
65cf478950ff Replaced obsolete stat module constants with equivalent attributes Raymond Hettinger <python@rcn.com> parents: 22830 diff changeset	162 b_type = stat.S_IFMT(b_stat.st_mode)
15543 785155e2cfca Update the code to better reflect recommended style: Fred Drake <fdrake@acm.org> parents: 15469 diff changeset	163 if a_type != b_type:
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	164 self.common_funny.append(x)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	165 elif stat.S_ISDIR(a_type):
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	166 self.common_dirs.append(x)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	167 elif stat.S_ISREG(a_type):
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	168 self.common_files.append(x)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	169 else:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	170 self.common_funny.append(x)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	171 else:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	172 self.common_funny.append(x)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	173
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	174 def phase3(self): # Find out differences between common files
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	175 xx = cmpfiles(self.left, self.right, self.common_files)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	176 self.same_files, self.diff_files, self.funny_files = xx
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	177
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	178 def phase4(self): # Find out differences between common subdirectories
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	179 # A new dircmp object is created for each common subdirectory,
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	180 # these are stored in a dictionary indexed by filename.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	181 # The hide and ignore properties are inherited from the parent
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	182 self.subdirs = {}
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	183 for x in self.common_dirs:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	184 a_x = os.path.join(self.left, x)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	185 b_x = os.path.join(self.right, x)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	186 self.subdirs[x] = dircmp(a_x, b_x, self.ignore, self.hide)
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	187
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	188 def phase4_closure(self): # Recursively call phase4() on subdirectories
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	189 self.phase4()
23634 dbee2f628a90 Replaced .keys() with dictionary iterators Raymond Hettinger <python@rcn.com> parents: 23625 diff changeset	190 for sd in self.subdirs.itervalues():
dbee2f628a90 Replaced .keys() with dictionary iterators Raymond Hettinger <python@rcn.com> parents: 23625 diff changeset	191 sd.phase4_closure()
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	192
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	193 def report(self): # Print a report on the differences between a and b
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	194 # Output format is purposely lousy
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	195 print 'diff', self.left, self.right
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	196 if self.left_only:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	197 self.left_only.sort()
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	198 print 'Only in', self.left, ':', self.left_only
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	199 if self.right_only:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	200 self.right_only.sort()
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	201 print 'Only in', self.right, ':', self.right_only
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	202 if self.same_files:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	203 self.same_files.sort()
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	204 print 'Identical files :', self.same_files
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	205 if self.diff_files:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	206 self.diff_files.sort()
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	207 print 'Differing files :', self.diff_files
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	208 if self.funny_files:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	209 self.funny_files.sort()
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	210 print 'Trouble with common files :', self.funny_files
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	211 if self.common_dirs:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	212 self.common_dirs.sort()
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	213 print 'Common subdirectories :', self.common_dirs
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	214 if self.common_funny:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	215 self.common_funny.sort()
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	216 print 'Common funny cases :', self.common_funny
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	217
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	218 def report_partial_closure(self): # Print reports on self and on subdirs
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	219 self.report()
23634 dbee2f628a90 Replaced .keys() with dictionary iterators Raymond Hettinger <python@rcn.com> parents: 23625 diff changeset	220 for sd in self.subdirs.itervalues():
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	221 print
23634 dbee2f628a90 Replaced .keys() with dictionary iterators Raymond Hettinger <python@rcn.com> parents: 23625 diff changeset	222 sd.report()
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	223
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	224 def report_full_closure(self): # Report on self and subdirs recursively
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	225 self.report()
23634 dbee2f628a90 Replaced .keys() with dictionary iterators Raymond Hettinger <python@rcn.com> parents: 23625 diff changeset	226 for sd in self.subdirs.itervalues():
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	227 print
23634 dbee2f628a90 Replaced .keys() with dictionary iterators Raymond Hettinger <python@rcn.com> parents: 23625 diff changeset	228 sd.report_full_closure()
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	229
28084 44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	230 methodmap = dict(subdirs=phase4,
44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	231 same_files=phase3, diff_files=phase3, funny_files=phase3,
44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	232 common_dirs = phase2, common_files=phase2, common_funny=phase2,
44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	233 common=phase1, left_only=phase1, right_only=phase1,
44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	234 left_list=phase0, right_list=phase0)
44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	235
44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	236 def __getattr__(self, attr):
44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	237 if attr not in self.methodmap:
44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	238 raise AttributeError, attr
44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	239 self.methodmap[attr](self)
44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	240 return getattr(self, attr)
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	241
34096 cf555ec698eb Removed deprecated use_statcache argument. Raymond Hettinger <python@rcn.com> parents: 30286 diff changeset	242 def cmpfiles(a, b, common, shallow=1):
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	243 """Compare common files in two directories.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	244
13316 fd78bc5f2b2c cmpfiles(): Added shallow and use_statcache parameters, with same meanings Fred Drake <fdrake@acm.org> parents: 13126 diff changeset	245 a, b -- directory names
fd78bc5f2b2c cmpfiles(): Added shallow and use_statcache parameters, with same meanings Fred Drake <fdrake@acm.org> parents: 13126 diff changeset	246 common -- list of file names found in both directories
fd78bc5f2b2c cmpfiles(): Added shallow and use_statcache parameters, with same meanings Fred Drake <fdrake@acm.org> parents: 13126 diff changeset	247 shallow -- if true, do comparison based solely on stat() information
fd78bc5f2b2c cmpfiles(): Added shallow and use_statcache parameters, with same meanings Fred Drake <fdrake@acm.org> parents: 13126 diff changeset	248
fd78bc5f2b2c cmpfiles(): Added shallow and use_statcache parameters, with same meanings Fred Drake <fdrake@acm.org> parents: 13126 diff changeset	249 Returns a tuple of three lists:
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	250 files that compare equal
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	251 files that are different
13316 fd78bc5f2b2c cmpfiles(): Added shallow and use_statcache parameters, with same meanings Fred Drake <fdrake@acm.org> parents: 13126 diff changeset	252 filenames that aren't regular files.
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	253
13316 fd78bc5f2b2c cmpfiles(): Added shallow and use_statcache parameters, with same meanings Fred Drake <fdrake@acm.org> parents: 13126 diff changeset	254 """
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	255 res = ([], [], [])
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	256 for x in common:
13316 fd78bc5f2b2c cmpfiles(): Added shallow and use_statcache parameters, with same meanings Fred Drake <fdrake@acm.org> parents: 13126 diff changeset	257 ax = os.path.join(a, x)
fd78bc5f2b2c cmpfiles(): Added shallow and use_statcache parameters, with same meanings Fred Drake <fdrake@acm.org> parents: 13126 diff changeset	258 bx = os.path.join(b, x)
27724 3982f117679e [Bug #680494] filecmp.py uses obsolete statcache module. Andrew M. Kuchling <amk@amk.ca> parents: 23634 diff changeset	259 res[_cmp(ax, bx, shallow)].append(x)
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	260 return res
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	261
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	262
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	263 # Compare two files.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	264 # Return:
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	265 # 0 for equal
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	266 # 1 for different
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	267 # 2 for funny cases (can't stat, etc.)
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	268 #
28084 44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	269 def _cmp(a, b, sh, abs=abs, cmp=cmp):
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	270 try:
27724 3982f117679e [Bug #680494] filecmp.py uses obsolete statcache module. Andrew M. Kuchling <amk@amk.ca> parents: 23634 diff changeset	271 return not abs(cmp(a, b, sh))
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	272 except os.error:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	273 return 2
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	274
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	275
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	276 # Return a copy with items that occur in skip removed.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	277 #
28084 44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	278 def _filter(flist, skip):
44ba1572518f Module review: Raymond Hettinger <python@rcn.com> parents: 27731 diff changeset	279 return list(ifilterfalse(skip.__contains__, flist))
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	280
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	281
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	282 # Demonstration and testing.
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	283 #
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	284 def demo():
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	285 import sys
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	286 import getopt
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	287 options, args = getopt.getopt(sys.argv[1:], 'r')
15543 785155e2cfca Update the code to better reflect recommended style: Fred Drake <fdrake@acm.org> parents: 15469 diff changeset	288 if len(args) != 2:
27731 c1ecdde32f86 Add DeprecationWarning when use_statcache argument is supplied Andrew M. Kuchling <amk@amk.ca> parents: 27724 diff changeset	289 raise getopt.GetoptError('need exactly two args', None)
13126 78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	290 dd = dircmp(args[0], args[1])
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	291 if ('-r', '') in options:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	292 dd.report_full_closure()
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	293 else:
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	294 dd.report()
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	295
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	296 if __name__ == '__main__':
78ad4f64adc5 Whoops! We just discovered that Gordon's revamp of this module was Guido van Rossum <guido@python.org> parents: 12080 diff changeset	297 demo()

Mercurial > cpython-lru_cache-weakref

annotate Lib/filecmp.py @ 39042:c02fa187e0f4 legacy-trunk