[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

[benjamin.peterson]

http://hg.python.org/cpython/rev/590caab5d6c7
changeset:   80867:590caab5d6c7
parent:      80863:d6f61cd364d9
parent:      80866:313225e42f99
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Dec 15 15:44:18 2012 -0500
summary:
  merge 3.3

files:
  Modules/_ctypes/_ctypes.c |  2 --
  1 files changed, 0 insertions(+), 2 deletions(-)


diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -2442,8 +2442,6 @@
 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))

-- 
Repository URL: http://hg.python.org/cpython