[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

Sat Mar 15 03:55:08 CET 2014

http://hg.python.org/cpython/rev/7ce22d0899e4
changeset: 89662:7ce22d0899e4
parent: 89659:061a9679ea2b
parent: 89661:ea27f0ed741f
user: Benjamin Peterson <benjamin at python.org>
date: Fri Mar 14 21:54:41 2014 -0500
summary:
 merge 3.3
files:
 Objects/listobject.c | 2 +-
 Objects/longobject.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Objects/listobject.c b/Objects/listobject.c
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -2043,7 +2043,7 @@
 if (keys != NULL) {
 for (i = 0; i < saved_ob_size; i++)
 Py_DECREF(keys[i]);
- if (keys != &ms.temparray[saved_ob_size+1])
+ if (saved_ob_size >= MERGESTATE_TEMP_SIZE/2)
 PyMem_FREE(keys);
 }
 
diff --git a/Objects/longobject.c b/Objects/longobject.c
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -37,8 +37,9 @@
 static PyObject *
 get_small_int(sdigit ival)
 {
+ PyObject *v;
 assert(-NSMALLNEGINTS <= ival && ival < NSMALLPOSINTS);
- PyObject *v = (PyObject *)&small_ints[ival + NSMALLNEGINTS];
+ v = (PyObject *)&small_ints[ival + NSMALLNEGINTS];
 Py_INCREF(v);
 #ifdef COUNT_ALLOCS
 if (ival >= 0)
-- 
Repository URL: http://hg.python.org/cpython
