diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2009-05-13 13:13:18 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2009-05-13 13:13:18 (GMT) |
| commit | 98c7879b655031dbe276500b8019fa2cee9c89a3 (patch) | |
| tree | 0773fed764291c514bfa19fc960713441bd4f1b8 | |
| parent | 666f1838a92c920642565604670666ab6a68e0fc (diff) | |
| download | cpython-98c7879b655031dbe276500b8019fa2cee9c89a3.zip cpython-98c7879b655031dbe276500b8019fa2cee9c89a3.tar.gz cpython-98c7879b655031dbe276500b8019fa2cee9c89a3.tar.bz2 | |
Merged revisions 72601 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72601 | r.david.murray | 2009-05-13 09:07:14 -0400 (Wed, 13 May 2009) | 3 lines
Move news item to correct section, remove spurious 'see below'
from docstring.
........
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Python/marshal.c | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -12,6 +12,8 @@ What's New in Python 2.6.3 Core and Builtins ----------------- +- Issue #5994: the marshal module now has docstrings. + - Issue #5981: Fix two minor inf/nan issues in float.fromhex: (1) inf and nan strings with trailing whitespace were incorrectly rejected and (2) the interpretation of fromhex('-nan') didn't match that of @@ -45,8 +47,6 @@ Core and Builtins Library ------- -- Issue #5994: the marshal module now has docstrings. - - Issue #5971: StreamHandler.handleError now swallows IOErrors which occur when trying to print a traceback. diff --git a/Python/marshal.c b/Python/marshal.c index c5a643f..52d2257 100644 --- a/Python/marshal.c +++ b/Python/marshal.c @@ -1242,7 +1242,7 @@ The value must be a supported type. Raise a ValueError exception if\n\ value has (or contains an object that has) an unsupported type.\n\ \n\ New in version 2.4: The version argument indicates the data format that\n\ -dumps should use (see below)."); +dumps should use."); static PyObject * |