mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 72601 via svnmerge from

Browse source 
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.
........
This commit is contained in:
R. David Murray 2009-05-13 13:13:18 +00:00
parent 666f1838a9
commit 98c7879b65
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Misc/NEWS
View file

@ -12,6 +12,8 @@ What's New in Python 2.6.3
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #5994: the marshal module now has docstrings.
- Issue #5981: Fix two minor inf/nan issues in float.fromhex: (1) inf - Issue #5981: Fix two minor inf/nan issues in float.fromhex: (1) inf
and nan strings with trailing whitespace were incorrectly rejected and nan strings with trailing whitespace were incorrectly rejected
and (2) the interpretation of fromhex('-nan') didn't match that of and (2) the interpretation of fromhex('-nan') didn't match that of
@ -45,8 +47,6 @@ Core and Builtins
Library Library
------- -------
- Issue #5994: the marshal module now has docstrings.
- Issue #5971: StreamHandler.handleError now swallows IOErrors which occur when - Issue #5971: StreamHandler.handleError now swallows IOErrors which occur when
trying to print a traceback. trying to print a traceback.

2
Python/marshal.c
View file

@ -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\ value has (or contains an object that has) an unsupported type.\n\
\n\ \n\
New in version 2.4: The version argument indicates the data format that\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 * static PyObject *