Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge from 3.5.

This commit is contained in:
Eric Snow 2015-06-03 11:11:22 -06:00
parent cbdb17f681 db4061cb9d
commit d8e5d6c4a5
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -37,6 +37,8 @@ Library
- Issue #24362: Simplify the C OrderedDict fast nodes resize logic.
- Issue #24377: Fix a ref leak in OrderedDict.__repr__.
What's New in Python 3.5.0 beta 2?
==================================

2
Objects/odictobject.c
View File

@ -1578,7 +1578,7 @@ odict_repr(PyODictObject *self)
if (value == NULL) {
if (!PyErr_Occurred())
PyErr_SetObject(PyExc_KeyError, key);
return NULL;
goto Done;
}
pair = PyTuple_Pack(2, key, value);
if (pair == NULL)