[Python-checkins] cpython (merge 3.5 -> default): Merge from 3.5.

Tue Jun 2 07:14:46 CEST 2015

https://hg.python.org/cpython/rev/e271305918ba
changeset: 96472:e271305918ba
parent: 96470:2326446ae796
parent: 96471:8631b88c23f6
user: Eric Snow <ericsnowcurrently at gmail.com>
date: Mon Jun 01 23:14:26 2015 -0600
summary:
 Merge from 3.5.
files:
 Lib/test/test_collections.py | 12 ++++++
 Misc/NEWS | 2 +
 Objects/odictobject.c | 46 ++++++-----------------
 3 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -2063,6 +2063,18 @@
 with self.assertRaises(KeyError):
 od.copy()
 
+ def test_issue24348(self):
+ OrderedDict = self.module.OrderedDict
+
+ class Key:
+ def __hash__(self):
+ return 1
+
+ od = OrderedDict()
+ od[Key()] = 0
+ # This should not crash.
+ od.popitem()
+
 
 class PurePythonGeneralMappingTests(mapping_tests.BasicTestMappingProtocol):
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,8 @@
 
 - Issue #24347: Set KeyError if PyDict_GetItemWithError returns NULL.
 
+- Issue #24348: Drop superfluous incref/decref.
+
 
 What's New in Python 3.5.0 beta 2?
 ==================================
diff --git a/Objects/odictobject.c b/Objects/odictobject.c
--- a/Objects/odictobject.c
+++ b/Objects/odictobject.c
@@ -1073,36 +1073,32 @@
 static PyObject *
 odict_setdefault(register PyODictObject *od, PyObject *args)
 {
- _ODictNode *node;
 PyObject *key, *result = NULL;
 PyObject *failobj = Py_None;
 
 /* both borrowed */
 if (!PyArg_UnpackTuple(args, "setdefault", 1, 2, &key, &failobj))
 return NULL;
- Py_INCREF(key);
- Py_INCREF(failobj);
 
 if (PyODict_CheckExact(od)) {
- node = _odict_find_node(od, key);
- if (node == NULL) {
- if (PyErr_Occurred()) {
- goto done;
- }
- else if (PyODict_SetItem((PyObject *)od, key, failobj) >= 0) {
+ result = PyODict_GetItemWithError(od, key); /* borrowed */
+ if (result == NULL) {
+ if (PyErr_Occurred())
+ return NULL;
+ assert(_odict_find_node(od, key) == NULL);
+ if (PyODict_SetItem((PyObject *)od, key, failobj) >= 0) {
 result = failobj;
 Py_INCREF(failobj);
 }
 }
 else {
- result = PyODict_GetItem(od, key); /* borrowed reference */
- Py_XINCREF(result);
+ Py_INCREF(result);
 }
 }
 else {
 int exists = PySequence_Contains((PyObject *)od, key);
 if (exists < 0) {
- goto done;
+ return NULL;
 }
 else if (exists) {
 result = PyObject_GetItem((PyObject *)od, key);
@@ -1113,9 +1109,6 @@
 }
 }
 
-done:
- Py_DECREF(failobj);
- Py_DECREF(key);
 return result;
 }
 
@@ -1150,21 +1143,18 @@
 _ODictNode *node;
 PyObject *value = NULL;
 
- Py_INCREF(key);
- Py_XINCREF(failobj);
-
 /* Pop the node first to avoid a possible dict resize (due to
 eval loop reentrancy) and complications due to hash collision
 resolution. */
 node = _odict_find_node((PyODictObject *)od, key);
 if (node == NULL) {
 if (PyErr_Occurred())
- goto done;
+ return NULL;
 }
 else {
 int res = _odict_clear_node((PyODictObject *)od, node, key);
 if (res < 0) {
- goto done;
+ return NULL;
 }
 }
 
@@ -1178,7 +1168,7 @@
 else {
 int exists = PySequence_Contains(od, key);
 if (exists < 0)
- goto done;
+ return NULL;
 if (exists) {
 value = PyObject_GetItem(od, key);
 if (value != NULL) {
@@ -1200,9 +1190,6 @@
 }
 }
 
-done:
- Py_DECREF(key);
- Py_XDECREF(failobj);
 return value;
 }
 
@@ -1229,19 +1216,19 @@
 
 if (!PyArg_UnpackTuple(args, "popitem", 0, 1, &last)) /* borrowed */
 return NULL;
- Py_XINCREF(last);
 
 if (last == NULL || last == Py_True)
 node = _odict_LAST((PyODictObject *)od);
 else
 node = _odict_FIRST((PyODictObject *)od);
- Py_XDECREF(last);
 
 key = _odictnode_KEY(node);
+ Py_INCREF(key);
 value = _odict_popkey(od, key, NULL);
 if (value == NULL)
 return NULL;
 item = PyTuple_Pack(2, key, value);
+ Py_DECREF(key);
 Py_DECREF(value);
 return item;
 }
@@ -1381,17 +1368,13 @@
 /* both borrowed */
 if (!PyArg_UnpackTuple(args, "move_to_end", 1, 2, &key, &last))
 return NULL;
- Py_INCREF(key);
 if (_odict_EMPTY(od)) {
 PyErr_SetObject(PyExc_KeyError, key);
- Py_DECREF(key);
 return NULL;
 }
 if (last != NULL) {
 int is_true;
- Py_INCREF(last);
 is_true = PyObject_IsTrue(last);
- Py_DECREF(last);
 if (is_true == -1)
 return NULL;
 pos = is_true ? -1 : 0;
@@ -1410,7 +1393,6 @@
 else {
 if (!PyErr_Occurred())
 PyErr_SetObject(PyExc_KeyError, key);
- Py_DECREF(key);
 return NULL;
 }
 }
@@ -1429,12 +1411,10 @@
 else {
 if (!PyErr_Occurred())
 PyErr_SetObject(PyExc_KeyError, key);
- Py_DECREF(key);
 return NULL;
 }
 }
 }
- Py_DECREF(key);
 Py_RETURN_NONE;
 }
 
-- 
Repository URL: https://hg.python.org/cpython
