| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  | """Utilities for comparing files and directories.
 | 
					
						
							| 
									
										
										
										
											1999-10-26 14:02:01 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  | Classes: | 
					
						
							|  |  |  |     dircmp | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | Functions: | 
					
						
							| 
									
										
										
										
											2009-05-17 12:19:44 +00:00
										 |  |  |     cmp(f1, f2, shallow=True) -> int | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     cmpfiles(a, b, common) -> ([], [], []) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | """
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | import os | 
					
						
							|  |  |  | import stat | 
					
						
							| 
									
										
										
										
											2008-03-13 02:09:15 +00:00
										 |  |  | from itertools import filterfalse | 
					
						
							| 
									
										
										
										
											1999-10-26 14:02:01 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-05-17 12:19:44 +00:00
										 |  |  | __all__ = ["cmp", "dircmp", "cmpfiles"] | 
					
						
							| 
									
										
										
										
											2001-01-20 23:34:12 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1999-10-26 14:02:01 +00:00
										 |  |  | _cache = {} | 
					
						
							| 
									
										
										
										
											2009-05-17 12:19:44 +00:00
										 |  |  | BUFSIZE = 8*1024 | 
					
						
							| 
									
										
										
										
											1999-10-26 14:02:01 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-05-17 12:19:44 +00:00
										 |  |  | def cmp(f1, f2, shallow=True): | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     """Compare two files.
 | 
					
						
							| 
									
										
										
										
											1999-10-26 14:02:01 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     Arguments: | 
					
						
							| 
									
										
										
										
											1999-10-26 14:02:01 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     f1 -- First file name | 
					
						
							| 
									
										
										
										
											1999-10-26 14:02:01 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     f2 -- Second file name | 
					
						
							| 
									
										
										
										
											1999-10-26 14:02:01 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     shallow -- Just check stat signature (do not read the files). | 
					
						
							|  |  |  |                defaults to 1. | 
					
						
							| 
									
										
										
										
											1999-10-26 14:02:01 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     Return value: | 
					
						
							| 
									
										
										
										
											1999-10-26 14:02:01 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2002-04-04 22:55:58 +00:00
										 |  |  |     True if the files are the same, False otherwise. | 
					
						
							| 
									
										
										
										
											1999-10-26 14:02:01 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     This function uses a cache for past comparisons and the results, | 
					
						
							|  |  |  |     with a cache invalidation mechanism relying on stale signatures. | 
					
						
							| 
									
										
										
										
											1999-10-26 14:02:01 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     """
 | 
					
						
							| 
									
										
										
										
											2003-02-06 19:38:45 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2003-02-06 17:50:01 +00:00
										 |  |  |     s1 = _sig(os.stat(f1)) | 
					
						
							|  |  |  |     s2 = _sig(os.stat(f2)) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     if s1[0] != stat.S_IFREG or s2[0] != stat.S_IFREG: | 
					
						
							| 
									
										
										
										
											2002-04-04 22:55:58 +00:00
										 |  |  |         return False | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     if shallow and s1 == s2: | 
					
						
							| 
									
										
										
										
											2002-04-04 22:55:58 +00:00
										 |  |  |         return True | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     if s1[1] != s2[1]: | 
					
						
							| 
									
										
										
										
											2002-04-04 22:55:58 +00:00
										 |  |  |         return False | 
					
						
							| 
									
										
										
										
											1999-10-26 14:02:01 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-06-25 17:20:21 +02:00
										 |  |  |     outcome = _cache.get((f1, f2, s1, s2)) | 
					
						
							|  |  |  |     if outcome is None: | 
					
						
							|  |  |  |         outcome = _do_cmp(f1, f2) | 
					
						
							|  |  |  |         if len(_cache) > 100:      # limit the maximum size of the cache | 
					
						
							|  |  |  |             _cache.clear() | 
					
						
							|  |  |  |         _cache[f1, f2, s1, s2] = outcome | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     return outcome | 
					
						
							| 
									
										
										
										
											1999-10-26 14:02:01 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | def _sig(st): | 
					
						
							| 
									
										
										
										
											2002-06-01 19:51:15 +00:00
										 |  |  |     return (stat.S_IFMT(st.st_mode), | 
					
						
							|  |  |  |             st.st_size, | 
					
						
							|  |  |  |             st.st_mtime) | 
					
						
							| 
									
										
										
										
											1999-10-26 14:02:01 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | def _do_cmp(f1, f2): | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     bufsize = BUFSIZE | 
					
						
							| 
									
										
										
										
											2009-06-04 00:11:54 +00:00
										 |  |  |     with open(f1, 'rb') as fp1, open(f2, 'rb') as fp2: | 
					
						
							| 
									
										
											  
											
												Merged revisions 70342,70385-70387,70389-70390,70392-70393,70395,70400,70405-70406,70418,70438,70464,70468 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r70342 | georg.brandl | 2009-03-13 14:03:58 -0500 (Fri, 13 Mar 2009) | 1 line
  #5486: typos.
........
  r70385 | benjamin.peterson | 2009-03-15 09:38:55 -0500 (Sun, 15 Mar 2009) | 1 line
  fix tuple.index() error message #5495
........
  r70386 | georg.brandl | 2009-03-15 16:32:06 -0500 (Sun, 15 Mar 2009) | 1 line
  #5496: fix docstring of lookup().
........
  r70387 | georg.brandl | 2009-03-15 16:37:16 -0500 (Sun, 15 Mar 2009) | 1 line
  #5493: clarify __nonzero__ docs.
........
  r70389 | georg.brandl | 2009-03-15 16:43:38 -0500 (Sun, 15 Mar 2009) | 1 line
  Fix a small nit in the error message if bool() falls back on __len__ and it returns the wrong type: it would tell the user that __nonzero__ should return bool or int.
........
  r70390 | georg.brandl | 2009-03-15 16:44:43 -0500 (Sun, 15 Mar 2009) | 1 line
  #5491: clarify nested() semantics.
........
  r70392 | georg.brandl | 2009-03-15 16:46:00 -0500 (Sun, 15 Mar 2009) | 1 line
  #5488: add missing struct member.
........
  r70393 | georg.brandl | 2009-03-15 16:47:42 -0500 (Sun, 15 Mar 2009) | 1 line
  #5478: fix copy-paste oversight in function signature.
........
  r70395 | georg.brandl | 2009-03-15 16:51:48 -0500 (Sun, 15 Mar 2009) | 1 line
  #5276: document IDLESTARTUP and .Idle.py.
........
  r70400 | georg.brandl | 2009-03-15 16:59:37 -0500 (Sun, 15 Mar 2009) | 3 lines
  Fix markup in re docs and give a mail address in regex howto, so that
  the recommendation to send suggestions to the author can be followed.
........
  r70405 | georg.brandl | 2009-03-15 17:11:07 -0500 (Sun, 15 Mar 2009) | 7 lines
  Move the previously local import of threading to module level.
  This is cleaner and avoids lockups in obscure cases where a Queue
  is instantiated while the import lock is already held by another thread.
  OKed by Tim Peters.
........
  r70406 | hirokazu.yamamoto | 2009-03-15 17:43:14 -0500 (Sun, 15 Mar 2009) | 1 line
  Added skip for old MSVC.
........
  r70418 | georg.brandl | 2009-03-16 14:42:03 -0500 (Mon, 16 Mar 2009) | 1 line
  Add token markup.
........
  r70438 | benjamin.peterson | 2009-03-17 15:29:51 -0500 (Tue, 17 Mar 2009) | 1 line
  I thought this was begging for an example
........
  r70464 | benjamin.peterson | 2009-03-18 15:58:09 -0500 (Wed, 18 Mar 2009) | 1 line
  a much better example
........
  r70468 | benjamin.peterson | 2009-03-18 22:04:31 -0500 (Wed, 18 Mar 2009) | 1 line
  close files after comparing them
........
											
										 
											2009-03-21 17:31:58 +00:00
										 |  |  |         while True: | 
					
						
							|  |  |  |             b1 = fp1.read(bufsize) | 
					
						
							|  |  |  |             b2 = fp2.read(bufsize) | 
					
						
							|  |  |  |             if b1 != b2: | 
					
						
							|  |  |  |                 return False | 
					
						
							|  |  |  |             if not b1: | 
					
						
							|  |  |  |                 return True | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | # Directory comparison class. | 
					
						
							|  |  |  | # | 
					
						
							|  |  |  | class dircmp: | 
					
						
							|  |  |  |     """A class that manages the comparison of 2 directories.
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-05-17 12:19:44 +00:00
										 |  |  |     dircmp(a, b, ignore=None, hide=None) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |       A and B are directories. | 
					
						
							|  |  |  |       IGNORE is a list of names to ignore, | 
					
						
							|  |  |  |         defaults to ['RCS', 'CVS', 'tags']. | 
					
						
							|  |  |  |       HIDE is a list of names to hide, | 
					
						
							|  |  |  |         defaults to [os.curdir, os.pardir]. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     High level usage: | 
					
						
							|  |  |  |       x = dircmp(dir1, dir2) | 
					
						
							|  |  |  |       x.report() -> prints a report on the differences between dir1 and dir2 | 
					
						
							|  |  |  |        or | 
					
						
							|  |  |  |       x.report_partial_closure() -> prints report on differences between dir1 | 
					
						
							|  |  |  |             and dir2, and reports on common immediate subdirectories. | 
					
						
							|  |  |  |       x.report_full_closure() -> like report_partial_closure, | 
					
						
							|  |  |  |             but fully recursive. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     Attributes: | 
					
						
							|  |  |  |      left_list, right_list: The files in dir1 and dir2, | 
					
						
							|  |  |  |         filtered by hide and ignore. | 
					
						
							|  |  |  |      common: a list of names in both dir1 and dir2. | 
					
						
							|  |  |  |      left_only, right_only: names only in dir1, dir2. | 
					
						
							|  |  |  |      common_dirs: subdirectories in both dir1 and dir2. | 
					
						
							|  |  |  |      common_files: files in both dir1 and dir2. | 
					
						
							|  |  |  |      common_funny: names in both dir1 and dir2 where the type differs between | 
					
						
							|  |  |  |         dir1 and dir2, or the name is not stat-able. | 
					
						
							|  |  |  |      same_files: list of identical files. | 
					
						
							|  |  |  |      diff_files: list of filenames which differ. | 
					
						
							|  |  |  |      funny_files: list of files which could not be compared. | 
					
						
							|  |  |  |      subdirs: a dictionary of dircmp objects, keyed by names in common_dirs. | 
					
						
							|  |  |  |      """
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def __init__(self, a, b, ignore=None, hide=None): # Initialize | 
					
						
							|  |  |  |         self.left = a | 
					
						
							|  |  |  |         self.right = b | 
					
						
							|  |  |  |         if hide is None: | 
					
						
							|  |  |  |             self.hide = [os.curdir, os.pardir] # Names never to be shown | 
					
						
							|  |  |  |         else: | 
					
						
							|  |  |  |             self.hide = hide | 
					
						
							|  |  |  |         if ignore is None: | 
					
						
							|  |  |  |             self.ignore = ['RCS', 'CVS', 'tags'] # Names ignored in comparison | 
					
						
							|  |  |  |         else: | 
					
						
							|  |  |  |             self.ignore = ignore | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def phase0(self): # Compare everything except common subdirectories | 
					
						
							|  |  |  |         self.left_list = _filter(os.listdir(self.left), | 
					
						
							|  |  |  |                                  self.hide+self.ignore) | 
					
						
							|  |  |  |         self.right_list = _filter(os.listdir(self.right), | 
					
						
							|  |  |  |                                   self.hide+self.ignore) | 
					
						
							|  |  |  |         self.left_list.sort() | 
					
						
							|  |  |  |         self.right_list.sort() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def phase1(self): # Compute common names | 
					
						
							| 
									
										
										
										
											2008-03-13 02:09:15 +00:00
										 |  |  |         a = dict(zip(map(os.path.normcase, self.left_list), self.left_list)) | 
					
						
							|  |  |  |         b = dict(zip(map(os.path.normcase, self.right_list), self.right_list)) | 
					
						
							| 
									
										
										
										
											2008-03-13 00:19:26 +00:00
										 |  |  |         self.common = list(map(a.__getitem__, filter(b.__contains__, a))) | 
					
						
							| 
									
										
										
										
											2008-03-13 01:41:43 +00:00
										 |  |  |         self.left_only = list(map(a.__getitem__, filterfalse(b.__contains__, a))) | 
					
						
							|  |  |  |         self.right_only = list(map(b.__getitem__, filterfalse(a.__contains__, b))) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def phase2(self): # Distinguish files, directories, funnies | 
					
						
							|  |  |  |         self.common_dirs = [] | 
					
						
							|  |  |  |         self.common_files = [] | 
					
						
							|  |  |  |         self.common_funny = [] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         for x in self.common: | 
					
						
							|  |  |  |             a_path = os.path.join(self.left, x) | 
					
						
							|  |  |  |             b_path = os.path.join(self.right, x) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             ok = 1 | 
					
						
							|  |  |  |             try: | 
					
						
							| 
									
										
										
										
											2003-02-06 17:50:01 +00:00
										 |  |  |                 a_stat = os.stat(a_path) | 
					
						
							| 
									
										
										
										
											2007-01-10 16:19:56 +00:00
										 |  |  |             except os.error as why: | 
					
						
							| 
									
										
										
										
											2008-01-06 21:13:42 +00:00
										 |  |  |                 # print('Can\'t stat', a_path, ':', why.args[1]) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |                 ok = 0 | 
					
						
							|  |  |  |             try: | 
					
						
							| 
									
										
										
										
											2003-02-06 17:50:01 +00:00
										 |  |  |                 b_stat = os.stat(b_path) | 
					
						
							| 
									
										
										
										
											2007-01-10 16:19:56 +00:00
										 |  |  |             except os.error as why: | 
					
						
							| 
									
										
										
										
											2008-01-06 21:13:42 +00:00
										 |  |  |                 # print('Can\'t stat', b_path, ':', why.args[1]) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |                 ok = 0 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             if ok: | 
					
						
							| 
									
										
										
										
											2002-06-01 19:51:15 +00:00
										 |  |  |                 a_type = stat.S_IFMT(a_stat.st_mode) | 
					
						
							|  |  |  |                 b_type = stat.S_IFMT(b_stat.st_mode) | 
					
						
							| 
									
										
										
										
											2000-12-12 23:20:45 +00:00
										 |  |  |                 if a_type != b_type: | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |                     self.common_funny.append(x) | 
					
						
							|  |  |  |                 elif stat.S_ISDIR(a_type): | 
					
						
							|  |  |  |                     self.common_dirs.append(x) | 
					
						
							|  |  |  |                 elif stat.S_ISREG(a_type): | 
					
						
							|  |  |  |                     self.common_files.append(x) | 
					
						
							|  |  |  |                 else: | 
					
						
							|  |  |  |                     self.common_funny.append(x) | 
					
						
							|  |  |  |             else: | 
					
						
							|  |  |  |                 self.common_funny.append(x) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def phase3(self): # Find out differences between common files | 
					
						
							|  |  |  |         xx = cmpfiles(self.left, self.right, self.common_files) | 
					
						
							|  |  |  |         self.same_files, self.diff_files, self.funny_files = xx | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def phase4(self): # Find out differences between common subdirectories | 
					
						
							|  |  |  |         # A new dircmp object is created for each common subdirectory, | 
					
						
							|  |  |  |         # these are stored in a dictionary indexed by filename. | 
					
						
							|  |  |  |         # The hide and ignore properties are inherited from the parent | 
					
						
							|  |  |  |         self.subdirs = {} | 
					
						
							|  |  |  |         for x in self.common_dirs: | 
					
						
							|  |  |  |             a_x = os.path.join(self.left, x) | 
					
						
							|  |  |  |             b_x = os.path.join(self.right, x) | 
					
						
							|  |  |  |             self.subdirs[x]  = dircmp(a_x, b_x, self.ignore, self.hide) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def phase4_closure(self): # Recursively call phase4() on subdirectories | 
					
						
							|  |  |  |         self.phase4() | 
					
						
							| 
									
										
										
										
											2007-02-11 06:12:03 +00:00
										 |  |  |         for sd in self.subdirs.values(): | 
					
						
							| 
									
										
										
										
											2002-06-02 18:55:56 +00:00
										 |  |  |             sd.phase4_closure() | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def report(self): # Print a report on the differences between a and b | 
					
						
							|  |  |  |         # Output format is purposely lousy | 
					
						
							| 
									
										
										
										
											2007-02-09 05:37:30 +00:00
										 |  |  |         print('diff', self.left, self.right) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |         if self.left_only: | 
					
						
							|  |  |  |             self.left_only.sort() | 
					
						
							| 
									
										
										
										
											2007-02-09 05:37:30 +00:00
										 |  |  |             print('Only in', self.left, ':', self.left_only) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |         if self.right_only: | 
					
						
							|  |  |  |             self.right_only.sort() | 
					
						
							| 
									
										
										
										
											2007-02-09 05:37:30 +00:00
										 |  |  |             print('Only in', self.right, ':', self.right_only) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |         if self.same_files: | 
					
						
							|  |  |  |             self.same_files.sort() | 
					
						
							| 
									
										
										
										
											2007-02-09 05:37:30 +00:00
										 |  |  |             print('Identical files :', self.same_files) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |         if self.diff_files: | 
					
						
							|  |  |  |             self.diff_files.sort() | 
					
						
							| 
									
										
										
										
											2007-02-09 05:37:30 +00:00
										 |  |  |             print('Differing files :', self.diff_files) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |         if self.funny_files: | 
					
						
							|  |  |  |             self.funny_files.sort() | 
					
						
							| 
									
										
										
										
											2007-02-09 05:37:30 +00:00
										 |  |  |             print('Trouble with common files :', self.funny_files) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |         if self.common_dirs: | 
					
						
							|  |  |  |             self.common_dirs.sort() | 
					
						
							| 
									
										
										
										
											2007-02-09 05:37:30 +00:00
										 |  |  |             print('Common subdirectories :', self.common_dirs) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |         if self.common_funny: | 
					
						
							|  |  |  |             self.common_funny.sort() | 
					
						
							| 
									
										
										
										
											2007-02-09 05:37:30 +00:00
										 |  |  |             print('Common funny cases :', self.common_funny) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def report_partial_closure(self): # Print reports on self and on subdirs | 
					
						
							|  |  |  |         self.report() | 
					
						
							| 
									
										
										
										
											2007-02-11 06:12:03 +00:00
										 |  |  |         for sd in self.subdirs.values(): | 
					
						
							| 
									
										
										
										
											2007-02-09 05:37:30 +00:00
										 |  |  |             print() | 
					
						
							| 
									
										
										
										
											2002-06-02 18:55:56 +00:00
										 |  |  |             sd.report() | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def report_full_closure(self): # Report on self and subdirs recursively | 
					
						
							|  |  |  |         self.report() | 
					
						
							| 
									
										
										
										
											2007-02-11 06:12:03 +00:00
										 |  |  |         for sd in self.subdirs.values(): | 
					
						
							| 
									
										
										
										
											2007-02-09 05:37:30 +00:00
										 |  |  |             print() | 
					
						
							| 
									
										
										
										
											2002-06-02 18:55:56 +00:00
										 |  |  |             sd.report_full_closure() | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2003-02-27 00:05:31 +00:00
										 |  |  |     methodmap = dict(subdirs=phase4, | 
					
						
							|  |  |  |                      same_files=phase3, diff_files=phase3, funny_files=phase3, | 
					
						
							|  |  |  |                      common_dirs = phase2, common_files=phase2, common_funny=phase2, | 
					
						
							|  |  |  |                      common=phase1, left_only=phase1, right_only=phase1, | 
					
						
							|  |  |  |                      left_list=phase0, right_list=phase0) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def __getattr__(self, attr): | 
					
						
							|  |  |  |         if attr not in self.methodmap: | 
					
						
							| 
									
										
										
										
											2007-08-30 01:19:48 +00:00
										 |  |  |             raise AttributeError(attr) | 
					
						
							| 
									
										
										
										
											2003-02-27 00:05:31 +00:00
										 |  |  |         self.methodmap[attr](self) | 
					
						
							|  |  |  |         return getattr(self, attr) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-05-17 12:19:44 +00:00
										 |  |  | def cmpfiles(a, b, common, shallow=True): | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     """Compare common files in two directories.
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2000-07-03 08:18:47 +00:00
										 |  |  |     a, b -- directory names | 
					
						
							|  |  |  |     common -- list of file names found in both directories | 
					
						
							|  |  |  |     shallow -- if true, do comparison based solely on stat() information | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     Returns a tuple of three lists: | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |       files that compare equal | 
					
						
							|  |  |  |       files that are different | 
					
						
							| 
									
										
										
										
											2000-07-03 08:18:47 +00:00
										 |  |  |       filenames that aren't regular files. | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2000-07-03 08:18:47 +00:00
										 |  |  |     """
 | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     res = ([], [], []) | 
					
						
							|  |  |  |     for x in common: | 
					
						
							| 
									
										
										
										
											2000-07-03 08:18:47 +00:00
										 |  |  |         ax = os.path.join(a, x) | 
					
						
							|  |  |  |         bx = os.path.join(b, x) | 
					
						
							| 
									
										
										
										
											2003-02-06 17:50:01 +00:00
										 |  |  |         res[_cmp(ax, bx, shallow)].append(x) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     return res | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | # Compare two files. | 
					
						
							|  |  |  | # Return: | 
					
						
							| 
									
										
										
										
											2001-01-14 23:36:06 +00:00
										 |  |  | #       0 for equal | 
					
						
							|  |  |  | #       1 for different | 
					
						
							|  |  |  | #       2 for funny cases (can't stat, etc.) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  | # | 
					
						
							| 
									
										
										
										
											2003-02-27 00:05:31 +00:00
										 |  |  | def _cmp(a, b, sh, abs=abs, cmp=cmp): | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     try: | 
					
						
							| 
									
										
										
										
											2003-02-06 17:50:01 +00:00
										 |  |  |         return not abs(cmp(a, b, sh)) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     except os.error: | 
					
						
							|  |  |  |         return 2 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | # Return a copy with items that occur in skip removed. | 
					
						
							|  |  |  | # | 
					
						
							| 
									
										
										
										
											2003-02-27 00:05:31 +00:00
										 |  |  | def _filter(flist, skip): | 
					
						
							| 
									
										
										
										
											2008-03-13 01:41:43 +00:00
										 |  |  |     return list(filterfalse(skip.__contains__, flist)) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | # Demonstration and testing. | 
					
						
							|  |  |  | # | 
					
						
							|  |  |  | def demo(): | 
					
						
							|  |  |  |     import sys | 
					
						
							|  |  |  |     import getopt | 
					
						
							|  |  |  |     options, args = getopt.getopt(sys.argv[1:], 'r') | 
					
						
							| 
									
										
										
										
											2000-12-12 23:20:45 +00:00
										 |  |  |     if len(args) != 2: | 
					
						
							| 
									
										
										
										
											2003-02-06 19:38:45 +00:00
										 |  |  |         raise getopt.GetoptError('need exactly two args', None) | 
					
						
							| 
									
										
										
										
											2000-06-29 14:13:28 +00:00
										 |  |  |     dd = dircmp(args[0], args[1]) | 
					
						
							|  |  |  |     if ('-r', '') in options: | 
					
						
							|  |  |  |         dd.report_full_closure() | 
					
						
							|  |  |  |     else: | 
					
						
							|  |  |  |         dd.report() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | if __name__ == '__main__': | 
					
						
							|  |  |  |     demo() |