merge 3.2

benjaminp · benjaminp · commit 18d105b824ce · 2012-12-15T15:44:08.000-05:00
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -2442,8 +2442,6 @@ PyCData_traverse(CDataObject self, visitproc visit, void arg)`
`2442`	`2442`	`static int`
`2443`	`2443`	`PyCData_clear(CDataObject *self)`
`2444`	`2444`	`{`
`2445`		`- StgDictObject dict = PyObject_stgdict((PyObject )self);`
`2446`		`- assert(dict); /* Cannot be NULL for CDataObject instances */`
`2447`	`2445`	`Py_CLEAR(self->b_objects);`
`2448`	`2446`	`if ((self->b_needsfree)`
`2449`	`2447`	`&& _CDataObject_HasExternalBuffer(self))`