From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Mon, 14 Jan 2008 00:22:44 +0000 (+0000)
Subject: As discussed in issue 1700288:
X-Git-Tag: v2.6a1~623
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08ccf202e606a066668f4ef85df9a9c0d07e1ba1;p=thirdparty%2FPython%2Fcpython.git

As discussed in issue 1700288:
ctypes takes some liberties when creating python types: it modifies the types'
__dict__ directly, bypassing all the machinery of type objects which deal with
special methods.  And this broke recent optimisations of method lookup.
Now we try to modify the type with more "official" functions.
---

diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 1e0f9632f557..a9eb032b0106 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -410,7 +410,7 @@ static int
 StructType_setattro(PyObject *self, PyObject *key, PyObject *value)
 {
 	/* XXX Should we disallow deleting _fields_? */
-	if (-1 == PyObject_GenericSetAttr(self, key, value))
+	if (-1 == Py_TYPE(self)->tp_base->tp_setattro(self, key, value))
 		return -1;
 	
 	if (value && PyString_Check(key) &&
diff --git a/Modules/_ctypes/stgdict.c b/Modules/_ctypes/stgdict.c
index d92bdf4f0dcc..66dfb8417fc2 100644
--- a/Modules/_ctypes/stgdict.c
+++ b/Modules/_ctypes/stgdict.c
@@ -470,7 +470,7 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct)
 			Py_DECREF(pair);
 			return -1;
 		}
-		if (-1 == PyDict_SetItem(realdict, name, prop)) {
+		if (-1 == PyObject_SetAttr(type, name, prop)) {
 			Py_DECREF(prop);
 			Py_DECREF(pair);
 			return -1;