diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-04-12 16:58:02 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-04-12 16:58:02 (GMT) |
| commit | b2416e54b15d90b4a1bc917897912061830b42fc (patch) | |
| tree | a5873595439ad16bde67329092d7a0e0af78c0ac /Doc | |
| parent | af9c3cfd443692cfbb89d5a8eedf175356611b53 (diff) | |
| download | cpython-b2416e54b15d90b4a1bc917897912061830b42fc.zip cpython-b2416e54b15d90b4a1bc917897912061830b42fc.tar.gz cpython-b2416e54b15d90b4a1bc917897912061830b42fc.tar.bz2 | |
Merged revisions 80004 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80004 | r.david.murray | 2010-04-12 12:35:19 -0400 (Mon, 12 Apr 2010) | 13 lines
Issue #7585: use tab between components in unified and context diff headers.
Instead of spaces between the filename and date (or whatever the string
is that follows the filename, if any) use tabs. This is what the unix
'diff' command does, for example, and difflib was intended to follow
the 'standard' way of doing diffs. This improves compatibility with
patch tools. The docs and examples are also changed to recommended that
the date format used be the ISO 8601 format, which is what modern diff
tools emit by default.
Patch by Anatoly Techtonik.
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/difflib.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/difflib.rst b/Doc/library/difflib.rst index 433764c..566de72 100644 --- a/Doc/library/difflib.rst +++ b/Doc/library/difflib.rst @@ -140,8 +140,8 @@ diffs. For comparing directories and files, see also, the :mod:`filecmp` module. The context diff format normally has a header for filenames and modification times. Any or all of these may be specified using strings for *fromfile*, - *tofile*, *fromfiledate*, and *tofiledate*. The modification times are normally - expressed in the format returned by :func:`time.ctime`. If not specified, the + *tofile*, *fromfiledate*, and *tofiledate*. The modification times are normally + expressed in the ISO 8601 format. If not specified, the strings default to blanks. >>> s1 = ['bacon\n', 'eggs\n', 'ham\n', 'guido\n'] @@ -272,8 +272,8 @@ diffs. For comparing directories and files, see also, the :mod:`filecmp` module. The context diff format normally has a header for filenames and modification times. Any or all of these may be specified using strings for *fromfile*, - *tofile*, *fromfiledate*, and *tofiledate*. The modification times are normally - expressed in the format returned by :func:`time.ctime`. If not specified, the + *tofile*, *fromfiledate*, and *tofiledate*. The modification times are normally + expressed in the ISO 8601 format. If not specified, the strings default to blanks. |