Mercurial > cpython-lru_cache-weakref

changeset 58680:d75f887da772 2.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 72357,72367 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72357 | benjamin.peterson | 2009-05-05 14:09:21 -0700 (Tue, 05 May 2009) | 4 lines fix running test_capi with -R :: Also, fix a refleak in the test that was preventing running. :) ........ r72367 | benjamin.peterson | 2009-05-05 16:00:48 -0700 (Tue, 05 May 2009) | 1 line tabify :( ........
author Collin Winter <collinw@gmail.com>
date Wed, 03 Feb 2010 20:29:10 +0000
parents 32344c5cf932
children a64a0134e66c
files Modules/_testcapimodule.c
diffstat 1 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Modules/_testcapimodule.c	Wed Feb 03 14:18:16 2010 +0000
+++ b/Modules/_testcapimodule.c	Wed Feb 03 20:29:10 2010 +0000
@@ -226,6 +226,13 @@
 	long hash;
 
 	type = &_HashInheritanceTester_Type;
+
+	if (type->tp_dict != NULL)
+		/* The type has already been initialized. This probably means
+		   -R is being used. */
+		Py_RETURN_NONE;
+
+
 	obj = PyObject_New(PyObject, type);
 	if (obj == NULL) {
 		PyErr_Clear();
@@ -269,6 +276,8 @@
 		return NULL;
 	}
 
+	Py_DECREF(obj);
+
 	Py_RETURN_NONE;
 }