diff -r 1186d68715cc Doc/library/filecmp.rst --- a/Doc/library/filecmp.rst Wed Jul 04 19:33:45 2012 -0700 +++ b/Doc/library/filecmp.rst Thu Jul 05 17:08:21 2012 -0700 @@ -75,6 +75,9 @@ 'tags']``. *hide* is a list of names to hide, and defaults to ``[os.curdir, os.pardir]``. + The :class:`dircmp` class compares files by doing *shallow* comparisons + as described for :func:`filecmp.cmp`. + The :class:`dircmp` class provides the following methods: @@ -94,7 +97,7 @@ Print a comparison between *a* and *b* and common subdirectories (recursively). - The :class:`dircmp` offers a number of interesting attributes that may be + The :class:`dircmp` class offers a number of interesting attributes that may be used to get various bits of information about the directory trees being compared. @@ -146,12 +149,14 @@ .. attribute:: same_files - Files which are identical in both *a* and *b*. + Files which are identical in both *a* and *b*, using the class's + file comparison operator. .. attribute:: diff_files - Files which are in both *a* and *b*, whose contents differ. + Files which are in both *a* and *b*, whose contents differ according + to the class's file comparison operator. .. attribute:: funny_files diff -r 1186d68715cc Misc/ACKS --- a/Misc/ACKS Wed Jul 04 19:33:45 2012 -0700 +++ b/Misc/ACKS Thu Jul 05 17:08:21 2012 -0700 @@ -505,6 +505,7 @@ Drew Jenkins Flemming Kjær Jensen MunSic Jeong +Chris Jerdonek Jim Jewett Orjan Johansen Fredrik Johansson diff -r 1186d68715cc Misc/NEWS --- a/Misc/NEWS Wed Jul 04 19:33:45 2012 -0700 +++ b/Misc/NEWS Thu Jul 05 17:08:21 2012 -0700 @@ -64,6 +64,11 @@ - Issue #15235: Allow Berkley DB versions up to 5.3 to build the dbm module. +Documentation +------------- + +- Issue #15250: Document that filecmp.dircmp compares files shallowly. + What's New in Python 3.3.0 Beta 1? ================================== @@ -128,7 +133,7 @@ - Issue #15176: Clarified behavior, documentation, and implementation of os.listdir(). - + - Issue #15061: Re-implemented hmac.compare_digest() in C to prevent further timing analysis and to support all buffer protocol aware objects as well as ASCII only str instances safely.