summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Misc/NEWS4
-rw-r--r--Python/marshal.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 9278135..373405b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 *