From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 5 May 2009 21:11:54 +0000 (+0000)
Subject: Merged revisions 72357 via svnmerge from
X-Git-Tag: v3.1b1~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f172637bc7198e626fca2937e200170fbac64413;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 72357 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72357 | benjamin.peterson | 2009-05-05 16:09:21 -0500 (Tue, 05 May 2009) | 4 lines

  fix running test_capi with -R ::

  Also, fix a refleak in the test that was preventing running. :)
........
---

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 1cbb825236cb..3f7190ceaadd 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -227,6 +227,13 @@ test_lazy_hash_inheritance(PyObject* self)
 	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();
@@ -270,6 +277,8 @@ test_lazy_hash_inheritance(PyObject* self)
 		return NULL;
 	}
 
+        Py_DECREF(obj);
+
 	Py_RETURN_NONE;
 }