mirror of
https://github.com/python/cpython.git
synced 2025-10-20 05:41:23 +00:00

svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55326 | guido.van.rossum | 2007-05-14 15:07:35 -0700 (Mon, 14 May 2007) | 2 lines Don't use err.message, use err.args[0]. ................ r55327 | guido.van.rossum | 2007-05-14 15:11:37 -0700 (Mon, 14 May 2007) | 259 lines Merged revisions 54988-55226,55228-55323 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r54995 | neal.norwitz | 2007-04-26 23:45:32 -0700 (Thu, 26 Apr 2007) | 3 lines This gets the test working on Solaris. It seems a little hokey to me, but the test passed on Linux and Solaris, hopefully other platforms too. ........ r55002 | georg.brandl | 2007-04-27 12:20:00 -0700 (Fri, 27 Apr 2007) | 2 lines Version fix (bug #1708710) ........ r55021 | neal.norwitz | 2007-04-29 16:53:24 -0700 (Sun, 29 Apr 2007) | 1 line There really are some tests that are problematic. ........ r55024 | kristjan.jonsson | 2007-04-30 08:17:46 -0700 (Mon, 30 Apr 2007) | 1 line Complete revamp of PCBuild8 directory. Use subdirectories for each project under the main pcbuild solution. Now make extensive use of property sheets to simplify project configuration. x64 build fully supported, and the process for building PGO version (Profiler Guided Optimization) simplified. All projects are now present, except _ssl, which needs to be reimplemented. Also, some of the projects that require external libraries need extra work to fully compile on x64. ........ r55025 | thomas.heller | 2007-04-30 08:44:17 -0700 (Mon, 30 Apr 2007) | 4 lines Make sure to call PyErr_NoMemory() in several places where PyMem_Malloc() could potentially fail. Will backport to the release25-maint branch. ........ r55027 | thomas.heller | 2007-04-30 09:04:57 -0700 (Mon, 30 Apr 2007) | 8 lines When accessing the .value attribute of a c_wchar_p instance, and the instance does not point to a valid wchar_t zero-terminated string, raise a ValueError. c_char_p does this already. The ValueError message now contains the correct pointer address. Will backport to release25-maint. ........ r55036 | georg.brandl | 2007-04-30 23:04:11 -0700 (Mon, 30 Apr 2007) | 2 lines Bug #1710295: exceptions are now new-style classes. ........ r55038 | georg.brandl | 2007-04-30 23:08:15 -0700 (Mon, 30 Apr 2007) | 2 lines Patch #1710352: add missing public functions to locale.__all__. ........ r55041 | vinay.sajip | 2007-05-01 03:20:03 -0700 (Tue, 01 May 2007) | 1 line Added new optional credentials argument to SMTPHandler.__init__, and smtp.login() is now called in SMTPHandler.emit() if credentials are specified. ........ r55042 | vinay.sajip | 2007-05-01 03:21:45 -0700 (Tue, 01 May 2007) | 1 line Added documentation for new optional credentials argument to SMTPHandler.__init__(). ........ r55070 | neal.norwitz | 2007-05-01 21:47:55 -0700 (Tue, 01 May 2007) | 3 lines Stop using PyMem_FREE while the GIL is not held. For details see: http://mail.python.org/pipermail/python-dev/2007-May/072896.html ........ r55080 | armin.rigo | 2007-05-02 12:23:31 -0700 (Wed, 02 May 2007) | 6 lines Fix for #1303614 and #1174712: - __dict__ descriptor abuse for subclasses of built-in types - subclassing from both ModuleType and another built-in types Thanks zseil for the patch. ........ r55083 | georg.brandl | 2007-05-02 13:02:29 -0700 (Wed, 02 May 2007) | 3 lines Actually raise an exception before calling ast_error_finish. Triggers an assertion otherwise. ........ r55087 | neal.norwitz | 2007-05-02 23:47:18 -0700 (Wed, 02 May 2007) | 1 line Handle a couple of uncaught errors. This should be backported ........ r55090 | neal.norwitz | 2007-05-03 00:20:57 -0700 (Thu, 03 May 2007) | 4 lines Remove dead code. This code couldn't be reached because earlier in the function there is another check for z != Py_None. ........ r55092 | thomas.heller | 2007-05-03 05:02:08 -0700 (Thu, 03 May 2007) | 1 line Fix building _ctypes.pyd for x64 / Windows. ........ r55093 | thomas.heller | 2007-05-03 05:05:20 -0700 (Thu, 03 May 2007) | 1 line Don't truncate pointers to integers (on win64 platform). ........ r55094 | walter.doerwald | 2007-05-03 08:13:55 -0700 (Thu, 03 May 2007) | 3 lines Clarify the behaviour of PyUnicode_DecodeUTF16(): A BOM is only skipped in native order mode, and only if it's the first two bytes. ........ r55101 | kristjan.jonsson | 2007-05-03 13:04:53 -0700 (Thu, 03 May 2007) | 2 lines Fix pcbuild8 after recent overhaul: Added the version resource to python26.dll. Adjust stacksize to 2Mb and made large address aware for 32 bits, and set stacksize to 3Mb for 64 bits. Todo: Set .dll optimized load addresses, and side-by-side packaging of the python26.dll. ........ r55102 | kristjan.jonsson | 2007-05-03 13:09:56 -0700 (Thu, 03 May 2007) | 1 line Fix those parts in the testsuite that assumed that sys.maxint would cause overflow on x64. Now the testsuite is well behaved on that platform. ........ r55103 | kristjan.jonsson | 2007-05-03 13:27:03 -0700 (Thu, 03 May 2007) | 11 lines Fix problems in x64 build that were discovered by the testsuite: - Reenable modules on x64 that had been disabled aeons ago for Itanium. - Cleared up confusion about compilers for 64 bit windows. There is only Itanium and x64. Added macros MS_WINI64 and MS_WINX64 for those rare cases where it matters, such as the disabling of modules above. - Set target platform (_WIN32_WINNT and WINVER) to 0x0501 (XP) for x64, and 0x0400 (NT 4.0) otherwise, which are the targeted minimum platforms. - Fixed thread_nt.h. The emulated InterlockedCompareExchange function didn?\194?\180t work on x64, probaby due to the lack of a "volatile" specifier. Anyway, win95 is no longer a target platform. - Itertools module used wrong constant to check for overflow in count() - PyInt_AsSsize_t couldn't deal with attribute error when accessing the __long__ member. - PyLong_FromSsize_t() incorrectly specified that the operand were unsigned. With these changes, the x64 passes the testsuite, for those modules present. ........ r55107 | kristjan.jonsson | 2007-05-03 17:25:08 -0700 (Thu, 03 May 2007) | 1 line Revert compiler comment to AMD64 for x64/AMD64 builds. ........ r55115 | thomas.heller | 2007-05-04 00:14:39 -0700 (Fri, 04 May 2007) | 4 lines Fix some ctypes test crashes, when running with a debug Python version on win64 by using proper argtypes and restype function attributes. ........ r55117 | thomas.heller | 2007-05-04 01:20:41 -0700 (Fri, 04 May 2007) | 4 lines On 64-bit Windows, ffi_arg must be 8 bytes long. This fixes the remaining crashes in the ctypes tests, when functions return float or double types. ........ r55120 | kristjan.jonsson | 2007-05-04 08:48:15 -0700 (Fri, 04 May 2007) | 1 line Update the pcbuild8 solution. Straightened out the _ctypes project by using a .vsproj file and a masm64.rules file to avoid redundancy ........ r55121 | kristjan.jonsson | 2007-05-04 10:28:06 -0700 (Fri, 04 May 2007) | 1 line Minor fix of PCBuild8/_ctypes vcproj, moving include dir into the .vsprops file. ........ r55129 | thomas.heller | 2007-05-04 12:54:22 -0700 (Fri, 04 May 2007) | 3 lines Do not truncate 64-bit pointers to 32-bit integers. Fixes SF #1703286, will backport to release25-maint. ........ r55131 | thomas.heller | 2007-05-04 12:56:32 -0700 (Fri, 04 May 2007) | 1 line Oops, these tests do not run on Windows CE. ........ r55140 | brett.cannon | 2007-05-04 18:34:02 -0700 (Fri, 04 May 2007) | 2 lines Deprecate BaseException.message as per PEP 352. ........ r55154 | georg.brandl | 2007-05-05 11:55:37 -0700 (Sat, 05 May 2007) | 2 lines Bug #1713535: typo in logging example. ........ r55158 | vinay.sajip | 2007-05-06 10:53:37 -0700 (Sun, 06 May 2007) | 1 line Updates of recent changes to logging. ........ r55165 | neal.norwitz | 2007-05-07 00:02:26 -0700 (Mon, 07 May 2007) | 1 line Verify changes to the trunk go to the normal checkins list ........ r55169 | kristjan.jonsson | 2007-05-07 09:46:54 -0700 (Mon, 07 May 2007) | 1 line As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present. ........ r55197 | collin.winter | 2007-05-08 21:14:36 -0700 (Tue, 08 May 2007) | 9 lines Fix a bug in test.test_support.open_urlresource(). If the call to requires() doesn't precede the filesystem check, we get the following situation: 1. ./python Lib/test/regrtest.py test_foo # test needs urlfetch, not enabled, so skipped 2. ./python Lib/test/regrtest.py -u urlfetch test_foo # test runs 3. ./python Lib/test/regrtest.py test_foo # test runs (!) By moving the call to requires() *before* the filesystem check, the fact that fetched files are cached on the local disk becomes an implementation detail, rather than a semantics-changing point of note. ........ r55198 | neal.norwitz | 2007-05-08 23:43:15 -0700 (Tue, 08 May 2007) | 1 line Add markup for True/False. Will backport ........ r55205 | walter.doerwald | 2007-05-09 11:10:47 -0700 (Wed, 09 May 2007) | 4 lines Backport checkin: Fix a segfault when b"" was passed to b2a_qp() -- it was using strchr() instead of memchr(). ........ r55241 | neal.norwitz | 2007-05-10 22:55:15 -0700 (Thu, 10 May 2007) | 6 lines Don't ever report a failure when the sum of the reference count differences are zero. This should help reduce the false positives. The message about references leaking is maintained to provide as much info as possible rather than simply suppressing the message at the source. ........ r55242 | neal.norwitz | 2007-05-10 23:23:01 -0700 (Thu, 10 May 2007) | 1 line Fix typo in docstring (the module is popen2, not 3). ........ r55244 | neal.norwitz | 2007-05-10 23:56:52 -0700 (Thu, 10 May 2007) | 1 line Remove trailing whitespace in docstring ........ r55245 | neal.norwitz | 2007-05-10 23:57:33 -0700 (Thu, 10 May 2007) | 1 line Deprecate os.popen* and popen2 module in favor of the subprocess module. ........ r55247 | neal.norwitz | 2007-05-11 00:13:30 -0700 (Fri, 11 May 2007) | 1 line Deprecate os.popen* and popen2 module in favor of the subprocess module. (forgot the doc) ........ r55253 | georg.brandl | 2007-05-11 02:41:37 -0700 (Fri, 11 May 2007) | 3 lines Remove an XXX that is unnecessary. ........ r55258 | georg.brandl | 2007-05-11 04:04:26 -0700 (Fri, 11 May 2007) | 2 lines Patch #1714700: clarify os.linesep vs. tfiles opened in text mode. (backport) ........ r55259 | georg.brandl | 2007-05-11 04:43:56 -0700 (Fri, 11 May 2007) | 2 lines Update DDJ link. ........ r55273 | raymond.hettinger | 2007-05-11 10:59:59 -0700 (Fri, 11 May 2007) | 1 line Better tests for posixpath.commonprefix ........ r55287 | georg.brandl | 2007-05-12 14:06:41 -0700 (Sat, 12 May 2007) | 2 lines Bug #1046945: document SWIG options of distutils. ........ r55290 | georg.brandl | 2007-05-13 01:04:07 -0700 (Sun, 13 May 2007) | 2 lines Add bz2 to content encodings. ........ r55297 | neal.norwitz | 2007-05-13 13:45:05 -0700 (Sun, 13 May 2007) | 3 lines Remove Amoeba doc which was removed in version 1.0! according to Misc/HISTORY. Hopefully Guido won't shed a tear. :-) ........ r55298 | neal.norwitz | 2007-05-13 13:54:19 -0700 (Sun, 13 May 2007) | 1 line Remove references to stdwin which was removed long ago. ........ r55299 | neal.norwitz | 2007-05-13 14:13:42 -0700 (Sun, 13 May 2007) | 3 lines Remove support for freebsd[23] which haven't been released since 2000 or earlier. http://www.freebsd.org/releases/index.html ........ r55320 | raymond.hettinger | 2007-05-14 13:52:31 -0700 (Mon, 14 May 2007) | 1 line Small speedup. ........ ................
704 lines
26 KiB
TeX
704 lines
26 KiB
TeX
\section{\module{difflib} ---
|
|
Helpers for computing deltas}
|
|
|
|
\declaremodule{standard}{difflib}
|
|
\modulesynopsis{Helpers for computing differences between objects.}
|
|
\moduleauthor{Tim Peters}{tim_one@users.sourceforge.net}
|
|
\sectionauthor{Tim Peters}{tim_one@users.sourceforge.net}
|
|
% LaTeXification by Fred L. Drake, Jr. <fdrake@acm.org>.
|
|
|
|
\versionadded{2.1}
|
|
|
|
|
|
\begin{classdesc*}{SequenceMatcher}
|
|
This is a flexible class for comparing pairs of sequences of any
|
|
type, so long as the sequence elements are hashable. The basic
|
|
algorithm predates, and is a little fancier than, an algorithm
|
|
published in the late 1980's by Ratcliff and Obershelp under the
|
|
hyperbolic name ``gestalt pattern matching.'' The idea is to find
|
|
the longest contiguous matching subsequence that contains no
|
|
``junk'' elements (the Ratcliff and Obershelp algorithm doesn't
|
|
address junk). The same idea is then applied recursively to the
|
|
pieces of the sequences to the left and to the right of the matching
|
|
subsequence. This does not yield minimal edit sequences, but does
|
|
tend to yield matches that ``look right'' to people.
|
|
|
|
\strong{Timing:} The basic Ratcliff-Obershelp algorithm is cubic
|
|
time in the worst case and quadratic time in the expected case.
|
|
\class{SequenceMatcher} is quadratic time for the worst case and has
|
|
expected-case behavior dependent in a complicated way on how many
|
|
elements the sequences have in common; best case time is linear.
|
|
\end{classdesc*}
|
|
|
|
\begin{classdesc*}{Differ}
|
|
This is a class for comparing sequences of lines of text, and
|
|
producing human-readable differences or deltas. Differ uses
|
|
\class{SequenceMatcher} both to compare sequences of lines, and to
|
|
compare sequences of characters within similar (near-matching)
|
|
lines.
|
|
|
|
Each line of a \class{Differ} delta begins with a two-letter code:
|
|
|
|
\begin{tableii}{l|l}{code}{Code}{Meaning}
|
|
\lineii{'- '}{line unique to sequence 1}
|
|
\lineii{'+ '}{line unique to sequence 2}
|
|
\lineii{' '}{line common to both sequences}
|
|
\lineii{'? '}{line not present in either input sequence}
|
|
\end{tableii}
|
|
|
|
Lines beginning with `\code{?~}' attempt to guide the eye to
|
|
intraline differences, and were not present in either input
|
|
sequence. These lines can be confusing if the sequences contain tab
|
|
characters.
|
|
\end{classdesc*}
|
|
|
|
\begin{classdesc*}{HtmlDiff}
|
|
|
|
This class can be used to create an HTML table (or a complete HTML file
|
|
containing the table) showing a side by side, line by line comparison
|
|
of text with inter-line and intra-line change highlights. The table can
|
|
be generated in either full or contextual difference mode.
|
|
|
|
The constructor for this class is:
|
|
|
|
\begin{funcdesc}{__init__}{\optional{tabsize}\optional{,
|
|
wrapcolumn}\optional{, linejunk}\optional{, charjunk}}
|
|
|
|
Initializes instance of \class{HtmlDiff}.
|
|
|
|
\var{tabsize} is an optional keyword argument to specify tab stop spacing
|
|
and defaults to \code{8}.
|
|
|
|
\var{wrapcolumn} is an optional keyword to specify column number where
|
|
lines are broken and wrapped, defaults to \code{None} where lines are not
|
|
wrapped.
|
|
|
|
\var{linejunk} and \var{charjunk} are optional keyword arguments passed
|
|
into \code{ndiff()} (used by \class{HtmlDiff} to generate the
|
|
side by side HTML differences). See \code{ndiff()} documentation for
|
|
argument default values and descriptions.
|
|
|
|
\end{funcdesc}
|
|
|
|
The following methods are public:
|
|
|
|
\begin{funcdesc}{make_file}{fromlines, tolines
|
|
\optional{, fromdesc}\optional{, todesc}\optional{, context}\optional{,
|
|
numlines}}
|
|
Compares \var{fromlines} and \var{tolines} (lists of strings) and returns
|
|
a string which is a complete HTML file containing a table showing line by
|
|
line differences with inter-line and intra-line changes highlighted.
|
|
|
|
\var{fromdesc} and \var{todesc} are optional keyword arguments to specify
|
|
from/to file column header strings (both default to an empty string).
|
|
|
|
\var{context} and \var{numlines} are both optional keyword arguments.
|
|
Set \var{context} to \code{True} when contextual differences are to be
|
|
shown, else the default is \code{False} to show the full files.
|
|
\var{numlines} defaults to \code{5}. When \var{context} is \code{True}
|
|
\var{numlines} controls the number of context lines which surround the
|
|
difference highlights. When \var{context} is \code{False} \var{numlines}
|
|
controls the number of lines which are shown before a difference
|
|
highlight when using the "next" hyperlinks (setting to zero would cause
|
|
the "next" hyperlinks to place the next difference highlight at the top of
|
|
the browser without any leading context).
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{make_table}{fromlines, tolines
|
|
\optional{, fromdesc}\optional{, todesc}\optional{, context}\optional{,
|
|
numlines}}
|
|
Compares \var{fromlines} and \var{tolines} (lists of strings) and returns
|
|
a string which is a complete HTML table showing line by line differences
|
|
with inter-line and intra-line changes highlighted.
|
|
|
|
The arguments for this method are the same as those for the
|
|
\method{make_file()} method.
|
|
\end{funcdesc}
|
|
|
|
\file{Tools/scripts/diff.py} is a command-line front-end to this class
|
|
and contains a good example of its use.
|
|
|
|
\versionadded{2.4}
|
|
\end{classdesc*}
|
|
|
|
\begin{funcdesc}{context_diff}{a, b\optional{, fromfile}\optional{,
|
|
tofile}\optional{, fromfiledate}\optional{, tofiledate}\optional{,
|
|
n}\optional{, lineterm}}
|
|
Compare \var{a} and \var{b} (lists of strings); return a
|
|
delta (a generator generating the delta lines) in context diff
|
|
format.
|
|
|
|
Context diffs are a compact way of showing just the lines that have
|
|
changed plus a few lines of context. The changes are shown in a
|
|
before/after style. The number of context lines is set by \var{n}
|
|
which defaults to three.
|
|
|
|
By default, the diff control lines (those with \code{***} or \code{---})
|
|
are created with a trailing newline. This is helpful so that inputs created
|
|
from \function{file.readlines()} result in diffs that are suitable for use
|
|
with \function{file.writelines()} since both the inputs and outputs have
|
|
trailing newlines.
|
|
|
|
For inputs that do not have trailing newlines, set the \var{lineterm}
|
|
argument to \code{""} so that the output will be uniformly newline free.
|
|
|
|
The context diff format normally has a header for filenames and
|
|
modification times. Any or all of these may be specified using strings for
|
|
\var{fromfile}, \var{tofile}, \var{fromfiledate}, and \var{tofiledate}.
|
|
The modification times are normally expressed in the format returned by
|
|
\function{time.ctime()}. If not specified, the strings default to blanks.
|
|
|
|
\file{Tools/scripts/diff.py} is a command-line front-end for this
|
|
function.
|
|
|
|
\versionadded{2.3}
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{get_close_matches}{word, possibilities\optional{,
|
|
n}\optional{, cutoff}}
|
|
Return a list of the best ``good enough'' matches. \var{word} is a
|
|
sequence for which close matches are desired (typically a string),
|
|
and \var{possibilities} is a list of sequences against which to
|
|
match \var{word} (typically a list of strings).
|
|
|
|
Optional argument \var{n} (default \code{3}) is the maximum number
|
|
of close matches to return; \var{n} must be greater than \code{0}.
|
|
|
|
Optional argument \var{cutoff} (default \code{0.6}) is a float in
|
|
the range [0, 1]. Possibilities that don't score at least that
|
|
similar to \var{word} are ignored.
|
|
|
|
The best (no more than \var{n}) matches among the possibilities are
|
|
returned in a list, sorted by similarity score, most similar first.
|
|
|
|
\begin{verbatim}
|
|
>>> get_close_matches('appel', ['ape', 'apple', 'peach', 'puppy'])
|
|
['apple', 'ape']
|
|
>>> import keyword
|
|
>>> get_close_matches('wheel', keyword.kwlist)
|
|
['while']
|
|
>>> get_close_matches('apple', keyword.kwlist)
|
|
[]
|
|
>>> get_close_matches('accept', keyword.kwlist)
|
|
['except']
|
|
\end{verbatim}
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{ndiff}{a, b\optional{, linejunk}\optional{, charjunk}}
|
|
Compare \var{a} and \var{b} (lists of strings); return a
|
|
\class{Differ}-style delta (a generator generating the delta lines).
|
|
|
|
Optional keyword parameters \var{linejunk} and \var{charjunk} are
|
|
for filter functions (or \code{None}):
|
|
|
|
\var{linejunk}: A function that accepts a single string
|
|
argument, and returns true if the string is junk, or false if not.
|
|
The default is (\code{None}), starting with Python 2.3. Before then,
|
|
the default was the module-level function
|
|
\function{IS_LINE_JUNK()}, which filters out lines without visible
|
|
characters, except for at most one pound character (\character{\#}).
|
|
As of Python 2.3, the underlying \class{SequenceMatcher} class
|
|
does a dynamic analysis of which lines are so frequent as to
|
|
constitute noise, and this usually works better than the pre-2.3
|
|
default.
|
|
|
|
\var{charjunk}: A function that accepts a character (a string of
|
|
length 1), and returns if the character is junk, or false if not.
|
|
The default is module-level function \function{IS_CHARACTER_JUNK()},
|
|
which filters out whitespace characters (a blank or tab; note: bad
|
|
idea to include newline in this!).
|
|
|
|
\file{Tools/scripts/ndiff.py} is a command-line front-end to this
|
|
function.
|
|
|
|
\begin{verbatim}
|
|
>>> diff = ndiff('one\ntwo\nthree\n'.splitlines(1),
|
|
... 'ore\ntree\nemu\n'.splitlines(1))
|
|
>>> print ''.join(diff),
|
|
- one
|
|
? ^
|
|
+ ore
|
|
? ^
|
|
- two
|
|
- three
|
|
? -
|
|
+ tree
|
|
+ emu
|
|
\end{verbatim}
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{restore}{sequence, which}
|
|
Return one of the two sequences that generated a delta.
|
|
|
|
Given a \var{sequence} produced by \method{Differ.compare()} or
|
|
\function{ndiff()}, extract lines originating from file 1 or 2
|
|
(parameter \var{which}), stripping off line prefixes.
|
|
|
|
Example:
|
|
|
|
\begin{verbatim}
|
|
>>> diff = ndiff('one\ntwo\nthree\n'.splitlines(1),
|
|
... 'ore\ntree\nemu\n'.splitlines(1))
|
|
>>> diff = list(diff) # materialize the generated delta into a list
|
|
>>> print ''.join(restore(diff, 1)),
|
|
one
|
|
two
|
|
three
|
|
>>> print ''.join(restore(diff, 2)),
|
|
ore
|
|
tree
|
|
emu
|
|
\end{verbatim}
|
|
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{unified_diff}{a, b\optional{, fromfile}\optional{,
|
|
tofile}\optional{, fromfiledate}\optional{, tofiledate}\optional{,
|
|
n}\optional{, lineterm}}
|
|
Compare \var{a} and \var{b} (lists of strings); return a
|
|
delta (a generator generating the delta lines) in unified diff
|
|
format.
|
|
|
|
Unified diffs are a compact way of showing just the lines that have
|
|
changed plus a few lines of context. The changes are shown in a
|
|
inline style (instead of separate before/after blocks). The number
|
|
of context lines is set by \var{n} which defaults to three.
|
|
|
|
By default, the diff control lines (those with \code{---}, \code{+++},
|
|
or \code{@@}) are created with a trailing newline. This is helpful so
|
|
that inputs created from \function{file.readlines()} result in diffs
|
|
that are suitable for use with \function{file.writelines()} since both
|
|
the inputs and outputs have trailing newlines.
|
|
|
|
For inputs that do not have trailing newlines, set the \var{lineterm}
|
|
argument to \code{""} so that the output will be uniformly newline free.
|
|
|
|
The context diff format normally has a header for filenames and
|
|
modification times. Any or all of these may be specified using strings for
|
|
\var{fromfile}, \var{tofile}, \var{fromfiledate}, and \var{tofiledate}.
|
|
The modification times are normally expressed in the format returned by
|
|
\function{time.ctime()}. If not specified, the strings default to blanks.
|
|
|
|
\file{Tools/scripts/diff.py} is a command-line front-end for this
|
|
function.
|
|
|
|
\versionadded{2.3}
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{IS_LINE_JUNK}{line}
|
|
Return true for ignorable lines. The line \var{line} is ignorable
|
|
if \var{line} is blank or contains a single \character{\#},
|
|
otherwise it is not ignorable. Used as a default for parameter
|
|
\var{linejunk} in \function{ndiff()} before Python 2.3.
|
|
\end{funcdesc}
|
|
|
|
|
|
\begin{funcdesc}{IS_CHARACTER_JUNK}{ch}
|
|
Return true for ignorable characters. The character \var{ch} is
|
|
ignorable if \var{ch} is a space or tab, otherwise it is not
|
|
ignorable. Used as a default for parameter \var{charjunk} in
|
|
\function{ndiff()}.
|
|
\end{funcdesc}
|
|
|
|
|
|
\begin{seealso}
|
|
\seetitle[http://www.ddj.com/184407970?pgno=5]
|
|
{Pattern Matching: The Gestalt Approach}{Discussion of a
|
|
similar algorithm by John W. Ratcliff and D. E. Metzener.
|
|
This was published in
|
|
\citetitle[http://www.ddj.com/]{Dr. Dobb's Journal} in
|
|
July, 1988.}
|
|
\end{seealso}
|
|
|
|
|
|
\subsection{SequenceMatcher Objects \label{sequence-matcher}}
|
|
|
|
The \class{SequenceMatcher} class has this constructor:
|
|
|
|
\begin{classdesc}{SequenceMatcher}{\optional{isjunk\optional{,
|
|
a\optional{, b}}}}
|
|
Optional argument \var{isjunk} must be \code{None} (the default) or
|
|
a one-argument function that takes a sequence element and returns
|
|
true if and only if the element is ``junk'' and should be ignored.
|
|
Passing \code{None} for \var{isjunk} is equivalent to passing
|
|
\code{lambda x: 0}; in other words, no elements are ignored. For
|
|
example, pass:
|
|
|
|
\begin{verbatim}
|
|
lambda x: x in " \t"
|
|
\end{verbatim}
|
|
|
|
if you're comparing lines as sequences of characters, and don't want
|
|
to synch up on blanks or hard tabs.
|
|
|
|
The optional arguments \var{a} and \var{b} are sequences to be
|
|
compared; both default to empty strings. The elements of both
|
|
sequences must be hashable.
|
|
\end{classdesc}
|
|
|
|
|
|
\class{SequenceMatcher} objects have the following methods:
|
|
|
|
\begin{methoddesc}{set_seqs}{a, b}
|
|
Set the two sequences to be compared.
|
|
\end{methoddesc}
|
|
|
|
\class{SequenceMatcher} computes and caches detailed information about
|
|
the second sequence, so if you want to compare one sequence against
|
|
many sequences, use \method{set_seq2()} to set the commonly used
|
|
sequence once and call \method{set_seq1()} repeatedly, once for each
|
|
of the other sequences.
|
|
|
|
\begin{methoddesc}{set_seq1}{a}
|
|
Set the first sequence to be compared. The second sequence to be
|
|
compared is not changed.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{set_seq2}{b}
|
|
Set the second sequence to be compared. The first sequence to be
|
|
compared is not changed.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{find_longest_match}{alo, ahi, blo, bhi}
|
|
Find longest matching block in \code{\var{a}[\var{alo}:\var{ahi}]}
|
|
and \code{\var{b}[\var{blo}:\var{bhi}]}.
|
|
|
|
If \var{isjunk} was omitted or \code{None},
|
|
\method{get_longest_match()} returns \code{(\var{i}, \var{j},
|
|
\var{k})} such that \code{\var{a}[\var{i}:\var{i}+\var{k}]} is equal
|
|
to \code{\var{b}[\var{j}:\var{j}+\var{k}]}, where
|
|
\code{\var{alo} <= \var{i} <= \var{i}+\var{k} <= \var{ahi}} and
|
|
\code{\var{blo} <= \var{j} <= \var{j}+\var{k} <= \var{bhi}}.
|
|
For all \code{(\var{i'}, \var{j'}, \var{k'})} meeting those
|
|
conditions, the additional conditions
|
|
\code{\var{k} >= \var{k'}},
|
|
\code{\var{i} <= \var{i'}},
|
|
and if \code{\var{i} == \var{i'}}, \code{\var{j} <= \var{j'}}
|
|
are also met.
|
|
In other words, of all maximal matching blocks, return one that
|
|
starts earliest in \var{a}, and of all those maximal matching blocks
|
|
that start earliest in \var{a}, return the one that starts earliest
|
|
in \var{b}.
|
|
|
|
\begin{verbatim}
|
|
>>> s = SequenceMatcher(None, " abcd", "abcd abcd")
|
|
>>> s.find_longest_match(0, 5, 0, 9)
|
|
(0, 4, 5)
|
|
\end{verbatim}
|
|
|
|
If \var{isjunk} was provided, first the longest matching block is
|
|
determined as above, but with the additional restriction that no
|
|
junk element appears in the block. Then that block is extended as
|
|
far as possible by matching (only) junk elements on both sides.
|
|
So the resulting block never matches on junk except as identical
|
|
junk happens to be adjacent to an interesting match.
|
|
|
|
Here's the same example as before, but considering blanks to be junk.
|
|
That prevents \code{' abcd'} from matching the \code{' abcd'} at the
|
|
tail end of the second sequence directly. Instead only the
|
|
\code{'abcd'} can match, and matches the leftmost \code{'abcd'} in
|
|
the second sequence:
|
|
|
|
\begin{verbatim}
|
|
>>> s = SequenceMatcher(lambda x: x==" ", " abcd", "abcd abcd")
|
|
>>> s.find_longest_match(0, 5, 0, 9)
|
|
(1, 0, 4)
|
|
\end{verbatim}
|
|
|
|
If no blocks match, this returns \code{(\var{alo}, \var{blo}, 0)}.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{get_matching_blocks}{}
|
|
Return list of triples describing matching subsequences.
|
|
Each triple is of the form \code{(\var{i}, \var{j}, \var{n})}, and
|
|
means that \code{\var{a}[\var{i}:\var{i}+\var{n}] ==
|
|
\var{b}[\var{j}:\var{j}+\var{n}]}. The triples are monotonically
|
|
increasing in \var{i} and \var{j}.
|
|
|
|
The last triple is a dummy, and has the value \code{(len(\var{a}),
|
|
len(\var{b}), 0)}. It is the only triple with \code{\var{n} == 0}.
|
|
% Explain why a dummy is used!
|
|
|
|
If
|
|
\code{(\var{i}, \var{j}, \var{n})} and
|
|
\code{(\var{i'}, \var{j'}, \var{n'})} are adjacent triples in the list,
|
|
and the second is not the last triple in the list, then
|
|
\code{\var{i}+\var{n} != \var{i'}} or
|
|
\code{\var{j}+\var{n} != \var{j'}}; in other words, adjacent triples
|
|
always describe non-adjacent equal blocks.
|
|
\versionchanged[The guarantee that adjacent triples always describe
|
|
non-adjacent blocks was implemented]{2.5}
|
|
|
|
\begin{verbatim}
|
|
>>> s = SequenceMatcher(None, "abxcd", "abcd")
|
|
>>> s.get_matching_blocks()
|
|
[(0, 0, 2), (3, 2, 2), (5, 4, 0)]
|
|
\end{verbatim}
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{get_opcodes}{}
|
|
Return list of 5-tuples describing how to turn \var{a} into \var{b}.
|
|
Each tuple is of the form \code{(\var{tag}, \var{i1}, \var{i2},
|
|
\var{j1}, \var{j2})}. The first tuple has \code{\var{i1} ==
|
|
\var{j1} == 0}, and remaining tuples have \var{i1} equal to the
|
|
\var{i2} from the preceding tuple, and, likewise, \var{j1} equal to
|
|
the previous \var{j2}.
|
|
|
|
The \var{tag} values are strings, with these meanings:
|
|
|
|
\begin{tableii}{l|l}{code}{Value}{Meaning}
|
|
\lineii{'replace'}{\code{\var{a}[\var{i1}:\var{i2}]} should be
|
|
replaced by \code{\var{b}[\var{j1}:\var{j2}]}.}
|
|
\lineii{'delete'}{\code{\var{a}[\var{i1}:\var{i2}]} should be
|
|
deleted. Note that \code{\var{j1} == \var{j2}} in
|
|
this case.}
|
|
\lineii{'insert'}{\code{\var{b}[\var{j1}:\var{j2}]} should be
|
|
inserted at \code{\var{a}[\var{i1}:\var{i1}]}.
|
|
Note that \code{\var{i1} == \var{i2}} in this
|
|
case.}
|
|
\lineii{'equal'}{\code{\var{a}[\var{i1}:\var{i2}] ==
|
|
\var{b}[\var{j1}:\var{j2}]} (the sub-sequences are
|
|
equal).}
|
|
\end{tableii}
|
|
|
|
For example:
|
|
|
|
\begin{verbatim}
|
|
>>> a = "qabxcd"
|
|
>>> b = "abycdf"
|
|
>>> s = SequenceMatcher(None, a, b)
|
|
>>> for tag, i1, i2, j1, j2 in s.get_opcodes():
|
|
... print ("%7s a[%d:%d] (%s) b[%d:%d] (%s)" %
|
|
... (tag, i1, i2, a[i1:i2], j1, j2, b[j1:j2]))
|
|
delete a[0:1] (q) b[0:0] ()
|
|
equal a[1:3] (ab) b[0:2] (ab)
|
|
replace a[3:4] (x) b[2:3] (y)
|
|
equal a[4:6] (cd) b[3:5] (cd)
|
|
insert a[6:6] () b[5:6] (f)
|
|
\end{verbatim}
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{get_grouped_opcodes}{\optional{n}}
|
|
Return a generator of groups with up to \var{n} lines of context.
|
|
|
|
Starting with the groups returned by \method{get_opcodes()},
|
|
this method splits out smaller change clusters and eliminates
|
|
intervening ranges which have no changes.
|
|
|
|
The groups are returned in the same format as \method{get_opcodes()}.
|
|
\versionadded{2.3}
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{ratio}{}
|
|
Return a measure of the sequences' similarity as a float in the
|
|
range [0, 1].
|
|
|
|
Where T is the total number of elements in both sequences, and M is
|
|
the number of matches, this is 2.0*M / T. Note that this is
|
|
\code{1.0} if the sequences are identical, and \code{0.0} if they
|
|
have nothing in common.
|
|
|
|
This is expensive to compute if \method{get_matching_blocks()} or
|
|
\method{get_opcodes()} hasn't already been called, in which case you
|
|
may want to try \method{quick_ratio()} or
|
|
\method{real_quick_ratio()} first to get an upper bound.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{quick_ratio}{}
|
|
Return an upper bound on \method{ratio()} relatively quickly.
|
|
|
|
This isn't defined beyond that it is an upper bound on
|
|
\method{ratio()}, and is faster to compute.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{real_quick_ratio}{}
|
|
Return an upper bound on \method{ratio()} very quickly.
|
|
|
|
This isn't defined beyond that it is an upper bound on
|
|
\method{ratio()}, and is faster to compute than either
|
|
\method{ratio()} or \method{quick_ratio()}.
|
|
\end{methoddesc}
|
|
|
|
The three methods that return the ratio of matching to total characters
|
|
can give different results due to differing levels of approximation,
|
|
although \method{quick_ratio()} and \method{real_quick_ratio()} are always
|
|
at least as large as \method{ratio()}:
|
|
|
|
\begin{verbatim}
|
|
>>> s = SequenceMatcher(None, "abcd", "bcde")
|
|
>>> s.ratio()
|
|
0.75
|
|
>>> s.quick_ratio()
|
|
0.75
|
|
>>> s.real_quick_ratio()
|
|
1.0
|
|
\end{verbatim}
|
|
|
|
|
|
\subsection{SequenceMatcher Examples \label{sequencematcher-examples}}
|
|
|
|
|
|
This example compares two strings, considering blanks to be ``junk:''
|
|
|
|
\begin{verbatim}
|
|
>>> s = SequenceMatcher(lambda x: x == " ",
|
|
... "private Thread currentThread;",
|
|
... "private volatile Thread currentThread;")
|
|
\end{verbatim}
|
|
|
|
\method{ratio()} returns a float in [0, 1], measuring the similarity
|
|
of the sequences. As a rule of thumb, a \method{ratio()} value over
|
|
0.6 means the sequences are close matches:
|
|
|
|
\begin{verbatim}
|
|
>>> print round(s.ratio(), 3)
|
|
0.866
|
|
\end{verbatim}
|
|
|
|
If you're only interested in where the sequences match,
|
|
\method{get_matching_blocks()} is handy:
|
|
|
|
\begin{verbatim}
|
|
>>> for block in s.get_matching_blocks():
|
|
... print "a[%d] and b[%d] match for %d elements" % block
|
|
a[0] and b[0] match for 8 elements
|
|
a[8] and b[17] match for 6 elements
|
|
a[14] and b[23] match for 15 elements
|
|
a[29] and b[38] match for 0 elements
|
|
\end{verbatim}
|
|
|
|
Note that the last tuple returned by \method{get_matching_blocks()} is
|
|
always a dummy, \code{(len(\var{a}), len(\var{b}), 0)}, and this is
|
|
the only case in which the last tuple element (number of elements
|
|
matched) is \code{0}.
|
|
|
|
If you want to know how to change the first sequence into the second,
|
|
use \method{get_opcodes()}:
|
|
|
|
\begin{verbatim}
|
|
>>> for opcode in s.get_opcodes():
|
|
... print "%6s a[%d:%d] b[%d:%d]" % opcode
|
|
equal a[0:8] b[0:8]
|
|
insert a[8:8] b[8:17]
|
|
equal a[8:14] b[17:23]
|
|
equal a[14:29] b[23:38]
|
|
\end{verbatim}
|
|
|
|
See also the function \function{get_close_matches()} in this module,
|
|
which shows how simple code building on \class{SequenceMatcher} can be
|
|
used to do useful work.
|
|
|
|
|
|
\subsection{Differ Objects \label{differ-objects}}
|
|
|
|
Note that \class{Differ}-generated deltas make no claim to be
|
|
\strong{minimal} diffs. To the contrary, minimal diffs are often
|
|
counter-intuitive, because they synch up anywhere possible, sometimes
|
|
accidental matches 100 pages apart. Restricting synch points to
|
|
contiguous matches preserves some notion of locality, at the
|
|
occasional cost of producing a longer diff.
|
|
|
|
The \class{Differ} class has this constructor:
|
|
|
|
\begin{classdesc}{Differ}{\optional{linejunk\optional{, charjunk}}}
|
|
Optional keyword parameters \var{linejunk} and \var{charjunk} are
|
|
for filter functions (or \code{None}):
|
|
|
|
\var{linejunk}: A function that accepts a single string
|
|
argument, and returns true if the string is junk. The default is
|
|
\code{None}, meaning that no line is considered junk.
|
|
|
|
\var{charjunk}: A function that accepts a single character argument
|
|
(a string of length 1), and returns true if the character is junk.
|
|
The default is \code{None}, meaning that no character is
|
|
considered junk.
|
|
\end{classdesc}
|
|
|
|
\class{Differ} objects are used (deltas generated) via a single
|
|
method:
|
|
|
|
\begin{methoddesc}{compare}{a, b}
|
|
Compare two sequences of lines, and generate the delta (a sequence
|
|
of lines).
|
|
|
|
Each sequence must contain individual single-line strings ending
|
|
with newlines. Such sequences can be obtained from the
|
|
\method{readlines()} method of file-like objects. The delta generated
|
|
also consists of newline-terminated strings, ready to be printed as-is
|
|
via the \method{writelines()} method of a file-like object.
|
|
\end{methoddesc}
|
|
|
|
|
|
\subsection{Differ Example \label{differ-examples}}
|
|
|
|
This example compares two texts. First we set up the texts, sequences
|
|
of individual single-line strings ending with newlines (such sequences
|
|
can also be obtained from the \method{readlines()} method of file-like
|
|
objects):
|
|
|
|
\begin{verbatim}
|
|
>>> text1 = ''' 1. Beautiful is better than ugly.
|
|
... 2. Explicit is better than implicit.
|
|
... 3. Simple is better than complex.
|
|
... 4. Complex is better than complicated.
|
|
... '''.splitlines(1)
|
|
>>> len(text1)
|
|
4
|
|
>>> text1[0][-1]
|
|
'\n'
|
|
>>> text2 = ''' 1. Beautiful is better than ugly.
|
|
... 3. Simple is better than complex.
|
|
... 4. Complicated is better than complex.
|
|
... 5. Flat is better than nested.
|
|
... '''.splitlines(1)
|
|
\end{verbatim}
|
|
|
|
Next we instantiate a Differ object:
|
|
|
|
\begin{verbatim}
|
|
>>> d = Differ()
|
|
\end{verbatim}
|
|
|
|
Note that when instantiating a \class{Differ} object we may pass
|
|
functions to filter out line and character ``junk.'' See the
|
|
\method{Differ()} constructor for details.
|
|
|
|
Finally, we compare the two:
|
|
|
|
\begin{verbatim}
|
|
>>> result = list(d.compare(text1, text2))
|
|
\end{verbatim}
|
|
|
|
\code{result} is a list of strings, so let's pretty-print it:
|
|
|
|
\begin{verbatim}
|
|
>>> from pprint import pprint
|
|
>>> pprint(result)
|
|
[' 1. Beautiful is better than ugly.\n',
|
|
'- 2. Explicit is better than implicit.\n',
|
|
'- 3. Simple is better than complex.\n',
|
|
'+ 3. Simple is better than complex.\n',
|
|
'? ++ \n',
|
|
'- 4. Complex is better than complicated.\n',
|
|
'? ^ ---- ^ \n',
|
|
'+ 4. Complicated is better than complex.\n',
|
|
'? ++++ ^ ^ \n',
|
|
'+ 5. Flat is better than nested.\n']
|
|
\end{verbatim}
|
|
|
|
As a single multi-line string it looks like this:
|
|
|
|
\begin{verbatim}
|
|
>>> import sys
|
|
>>> sys.stdout.writelines(result)
|
|
1. Beautiful is better than ugly.
|
|
- 2. Explicit is better than implicit.
|
|
- 3. Simple is better than complex.
|
|
+ 3. Simple is better than complex.
|
|
? ++
|
|
- 4. Complex is better than complicated.
|
|
? ^ ---- ^
|
|
+ 4. Complicated is better than complex.
|
|
? ++++ ^ ^
|
|
+ 5. Flat is better than nested.
|
|
\end{verbatim}
|