diff options
| -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.7 alpha 1 Core and Builtins ----------------- +- Issue #5994: the marshal module now has docstrings. + - Issue #5981: Fix three minor inf/nan issues in float.fromhex: (1) inf and nan strings with trailing whitespace were incorrectly rejected; (2) parsing of strings representing infinities and nans @@ -291,8 +293,6 @@ Core and Builtins Library ------- -- Issue #5994: the marshal module now has docstrings. - - Issue #5977: distutils build_ext.get_outputs was not taking into account the inplace option. Initial patch by kxroberto. diff --git a/Python/marshal.c b/Python/marshal.c index d540e87..8f8ac36 100644 --- a/Python/marshal.c +++ b/Python/marshal.c @@ -1308,7 +1308,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 * |