merge 3.2

This commit is contained in:
Benjamin Peterson 2012-12-15 15:44:08 -05:00
commit 18d105b824
1 changed files with 0 additions and 2 deletions

View File

@ -2442,8 +2442,6 @@ PyCData_traverse(CDataObject *self, visitproc visit, void *arg)
static int
PyCData_clear(CDataObject *self)
{
StgDictObject *dict = PyObject_stgdict((PyObject *)self);
assert(dict); /* Cannot be NULL for CDataObject instances */
Py_CLEAR(self->b_objects);
if ((self->b_needsfree)
&& _CDataObject_HasExternalBuffer(self))