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 :(
........
This commit is contained in:
Collin Winter 2010-02-03 20:29:10 +00:00
parent 5adf89dbe1
commit 2905baff05
1 changed files with 9 additions and 0 deletions

View File

@ -226,6 +226,13 @@ test_lazy_hash_inheritance(PyObject* self)
long hash; long hash;
type = &_HashInheritanceTester_Type; 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); obj = PyObject_New(PyObject, type);
if (obj == NULL) { if (obj == NULL) {
PyErr_Clear(); PyErr_Clear();
@ -269,6 +276,8 @@ test_lazy_hash_inheritance(PyObject* self)
return NULL; return NULL;
} }
Py_DECREF(obj);
Py_RETURN_NONE; Py_RETURN_NONE;
} }