sip-4.3.2-python2.5.patch

sip-4.3.2-python2.5.patch (text/plain), 6.79 KB, created by Krzysztof Pawlik (RETIRED) on 2006-09-20 05:34:18 UTC

diff -Nru --exclude='*.py*' --exclude=Makefile sip-4.3.2.vanilla/siplib/objmap.c sip-4.3.2/siplib/objmap.c
--- sip-4.3.2.vanilla/siplib/objmap.c	2006-09-20 13:18:30.000000000 +0200
+++ sip-4.3.2/siplib/objmap.c	2006-09-20 13:26:13.000000000 +0200
@@ -114,8 +114,8 @@
 		 * of it, or vice versa, then we assume it is the same C++
 		 * object.
 		 */
-		if (PyObject_TypeCheck(w,&type -> super.type) ||
-		    PyType_IsSubtype(&type -> super.type,w -> ob_type))
+		if (PyObject_TypeCheck(w,&type -> super.ht_type) ||
+		    PyType_IsSubtype(&type -> super.ht_type,w -> ob_type))
 			return w;
 	}
 
diff -Nru --exclude='*.py*' --exclude=Makefile sip-4.3.2.vanilla/siplib/qtlib.cpp sip-4.3.2/siplib/qtlib.cpp
--- sip-4.3.2.vanilla/siplib/qtlib.cpp	2006-09-20 13:18:30.000000000 +0200
+++ sip-4.3.2/siplib/qtlib.cpp	2006-09-20 13:25:52.000000000 +0200
@@ -1252,7 +1252,7 @@
 				char *meth;
 
 				// Get the method name.
-				meth = ((PyCFunctionObject *)rxObj) -> m_ml -> ml_name;
+				meth = (char*)(((PyCFunctionObject *)rxObj) -> m_ml -> ml_name);
 
 				if ((sp -> name = (char *)sip_api_malloc(strlen(meth) + 2)) == NULL)
 					return -1;
diff -Nru --exclude='*.py*' --exclude=Makefile sip-4.3.2.vanilla/siplib/siplib.c sip-4.3.2/siplib/siplib.c
--- sip-4.3.2.vanilla/siplib/siplib.c	2006-09-20 13:18:30.000000000 +0200
+++ sip-4.3.2/siplib/siplib.c	2006-09-20 13:25:16.000000000 +0200
@@ -320,7 +320,7 @@
 	if (PyType_Ready(&sipWrapperType_Type) < 0)
 		Py_FatalError("sip: Failed to initialise sip.wrappertype type");
 
-	if (PyType_Ready(&sipWrapper_Type.super.type) < 0)
+	if (PyType_Ready(&sipWrapper_Type.super.ht_type) < 0)
 		Py_FatalError("sip: Failed to initialise sip.wrapper type");
 
 	if (PyType_Ready(&sipVoidPtr_Type) < 0)
@@ -725,7 +725,7 @@
 		sipWrapperType *wt;
 
 		while ((wt = *mw++) != NULL)
-			if (addInstances(wt -> super.type.tp_dict,&wt -> type -> td_instances) < 0)
+			if (addInstances(wt -> super.ht_type.tp_dict,&wt -> type -> td_instances) < 0)
 				return -1;
 	}
 
@@ -1622,7 +1622,7 @@
 				type = va_arg(va,sipWrapperType *);
 				va_arg(va,void **);
 
-				if (arg != Py_None && !PyObject_TypeCheck(arg,&type -> super.type))
+				if (arg != Py_None && !PyObject_TypeCheck(arg,&type -> super.ht_type))
 					valid = PARSE_TYPE;
 
 				/* Handle the sub-format. */
@@ -2489,7 +2489,7 @@
 
 	/* Get the dictionary into which the type will be placed. */
 	if (type -> td_scope >= 0)
-		dict = client -> em_types[type -> td_scope] -> super.type.tp_dict;
+		dict = client -> em_types[type -> td_scope] -> super.ht_type.tp_dict;
 	else
 		dict = mod_dict;
 
@@ -2558,7 +2558,7 @@
 
 	/* Get the dictionary into which the type will be placed. */
 	if (ed -> e_scope >= 0)
-		dict = client -> em_types[ed -> e_scope] -> super.type.tp_dict;
+		dict = client -> em_types[ed -> e_scope] -> super.ht_type.tp_dict;
 	else
 		dict = mod_dict;
 
@@ -2681,7 +2681,7 @@
 
 	self = PyTuple_GET_ITEM(args,argnr);
 
-	if (!PyObject_TypeCheck(self,&type -> super.type))
+	if (!PyObject_TypeCheck(self,&type -> super.ht_type))
 		return PARSE_UNBOUND;
 
 	*selfp = (sipWrapper *)self;
@@ -3455,7 +3455,7 @@
 {
 	/* If this is a wrapped type then get the type dictionary. */
 	if (sipWrapperType_Check(dict))
-		dict = ((sipWrapperType *)dict) -> super.type.tp_dict;
+		dict = ((sipWrapperType *)dict) -> super.ht_type.tp_dict;
 
 	return addSingleClassInstance(dict,name,cppPtr,wt,0);
 }
@@ -3777,7 +3777,7 @@
 			 * convertor might be able to convert the target type
 			 * to something more specific.
 			 */
-			if (PyType_IsSubtype(&type -> super.type,&scc -> scc_basetype -> super.type))
+			if (PyType_IsSubtype(&type -> super.ht_type,&scc -> scc_basetype -> super.ht_type))
 			{
 				sipWrapperType *subtype;
 
@@ -4362,7 +4362,7 @@
 	 */
 	if (self -> type == NULL)
 	{
-		PyObject *sc = self->super.type.tp_base;
+		PyObject *sc = self->super.ht_type.tp_base;
 
 		/*
 		 * Make sure that the type is derived from sip.wrapper.  It
@@ -4371,7 +4371,7 @@
 		 */
 		if (sc == NULL || !sipWrapperType_Check(sc))
 		{
-			PyErr_Format(PyExc_TypeError, "type %s must be derived from sip.wrapper", self->super.type.tp_name);
+			PyErr_Format(PyExc_TypeError, "type %s must be derived from sip.wrapper", self->super.ht_type.tp_name);
 			return -1;
 		}
 
@@ -4406,7 +4406,7 @@
 		PyObject *dict, *tmpdict, *proxy;
 		PyMethodDef *pmd;
 
-		dict = wt -> super.type.tp_dict;
+		dict = wt -> super.ht_type.tp_dict;
 
 		/* The base type doesn't have any type information. */
 		if ((td = wt -> type) == NULL)
@@ -4621,7 +4621,7 @@
 		}
 
 		/* See if it is an abstract type. */
-		if (sipTypeIsAbstract(wt) && strcmp(strchr(wt->type->td_name, '.') + 1, wt->super.type.tp_name) == 0)
+		if (sipTypeIsAbstract(wt) && strcmp(strchr(wt->type->td_name, '.') + 1, wt->super.ht_type.tp_name) == 0)
 		{
 			PyErr_Format(PyExc_TypeError, "%s represents a C++ abstract class and cannot be instantiated", wt->type->td_name);
 
@@ -4630,7 +4630,7 @@
 	}
 
 	/* Call the standard super-type new. */
-	return PyBaseObject_Type.tp_new(&wt -> super.type,args,kwds);
+	return PyBaseObject_Type.tp_new(&wt -> super.ht_type,args,kwds);
 }
 
 
@@ -5131,8 +5131,8 @@
 		switch (slots++ -> psd_type)
 		{
 		case str_slot:
-			if (sp -> type.tp_str == NULL)
-				sp -> type.tp_str = (reprfunc)f;
+			if (sp -> ht_type.tp_str == NULL)
+				sp -> ht_type.tp_str = (reprfunc)f;
 			break;
 
 		case int_slot:
@@ -5278,8 +5278,8 @@
 			break;
 
 		case call_slot:
-			if (sp -> type.tp_call == NULL)
-				sp -> type.tp_call = sipWrapper_call;
+			if (sp -> ht_type.tp_call == NULL)
+				sp -> ht_type.tp_call = sipWrapper_call;
 			break;
 
 		case getitem_slot:
@@ -5303,13 +5303,13 @@
 		case ne_slot:
 		case gt_slot:
 		case ge_slot:
-			if (sp -> type.tp_richcompare == NULL)
-				sp -> type.tp_richcompare = sipWrapper_richcompare;
+			if (sp -> ht_type.tp_richcompare == NULL)
+				sp -> ht_type.tp_richcompare = sipWrapper_richcompare;
 			break;
 
 		case cmp_slot:
-			if (sp -> type.tp_compare == NULL)
-				sp -> type.tp_compare = (cmpfunc)f;
+			if (sp -> ht_type.tp_compare == NULL)
+				sp -> ht_type.tp_compare = (cmpfunc)f;
 			break;
 
 		case nonzero_slot:
@@ -5323,8 +5323,8 @@
 			break;
 
 		case repr_slot:
-			if (sp -> type.tp_repr == NULL)
-				sp -> type.tp_repr = (reprfunc)f;
+			if (sp -> ht_type.tp_repr == NULL)
+				sp -> ht_type.tp_repr = (reprfunc)f;
 			break;
 
 		case pos_slot:
diff -Nru sip-4.3.2.vanilla/sipgen/gencode.c sip-4.3.2/sipgen/gencode.c
--- sip-4.3.2.vanilla/sipgen/gencode.c	2005-11-14 18:31:01.000000000 +0100
+++ sip-4.3.2/sipgen/gencode.c	2006-09-20 14:03:18.000000000 +0200
@@ -3237,7 +3237,7 @@
 
 	if (isNumberSlot(md) || isInplaceNumberSlot(md))
 		prcode(fp,
-"	if (!PyType_IsSubtype(sipSelf -> ob_type,&sipClass_%C -> super.type))\n"
+"	if (!PyType_IsSubtype(sipSelf -> ob_type,&sipClass_%C -> super.ht_type))\n"
 "	{\n"
 "		Py_INCREF(Py_NotImplemented);\n"
 "		return Py_NotImplemented;\n"