diff options
| author | Guido van Rossum <guido@python.org> | 2007-11-19 18:03:44 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-11-19 18:03:44 (GMT) |
| commit | 87c0f1d1c95eb1766a1340cd100533dfd7a86d52 (patch) | |
| tree | 76c3bee37e7effe5933d830f6fd0cc4ce15c9afc /Doc/library | |
| parent | 87afcbfe549bce674c52b0163bcf4dab6eea616e (diff) | |
| download | cpython-87c0f1d1c95eb1766a1340cd100533dfd7a86d52.zip cpython-87c0f1d1c95eb1766a1340cd100533dfd7a86d52.tar.gz cpython-87c0f1d1c95eb1766a1340cd100533dfd7a86d52.tar.bz2 | |
Merged revisions 59041-59055 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59044 | neal.norwitz | 2007-11-18 17:46:20 -0800 (Sun, 18 Nov 2007) | 1 line
Use a slightly more recent version than 1.5.2b2.
........
r59047 | walter.doerwald | 2007-11-19 04:14:05 -0800 (Mon, 19 Nov 2007) | 2 lines
Fix typo in comment.
........
r59049 | walter.doerwald | 2007-11-19 04:41:10 -0800 (Mon, 19 Nov 2007) | 4 lines
Fix for #1444: utf_8_sig.StreamReader was (indirectly through decode())
calling codecs.utf_8_decode() with final==True, which falled with incomplete
byte sequences. Fix and test by James G. Sack.
........
r59051 | nick.coghlan | 2007-11-19 05:56:27 -0800 (Mon, 19 Nov 2007) | 1 line
Enable some test_cmd_line_script debugging output to investigate failure on Mac OSX buildbot
........
r59053 | facundo.batista | 2007-11-19 08:30:24 -0800 (Mon, 19 Nov 2007) | 3 lines
Fixed detail in add_type() explanation (issue 1463).
........
r59054 | guido.van.rossum | 2007-11-19 09:35:24 -0800 (Mon, 19 Nov 2007) | 2 lines
Make this work stand-alone, too.
........
r59055 | guido.van.rossum | 2007-11-19 09:50:22 -0800 (Mon, 19 Nov 2007) | 3 lines
Fix the OSX failures in this test -- they were due to /tmp being a symlink
to /private/tmp. Adding a call to os.path.realpath() to temp_dir() fixed it.
........
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/mimetypes.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/mimetypes.rst b/Doc/library/mimetypes.rst index 50140c6..f59cd82 100644 --- a/Doc/library/mimetypes.rst +++ b/Doc/library/mimetypes.rst @@ -96,8 +96,8 @@ behavior of the module. extension is already known, the new type will replace the old one. When the type is already known the extension will be added to the list of known extensions. - When *strict* is the mapping will added to the official MIME types, otherwise to - the non-standard ones. + When *strict* is True (the default), the mapping will added to the official MIME + types, otherwise to the non-standard ones. .. data:: inited |