@@ -1,3 +1,26 @@ +2009/04/30 22:10:15 phil +%DefaultSupertype now only changes the default for the current module. +(%DefaultMetatype still affects importing modules.) This should mean that +modules that extend PyQt4 will continue to work without having to make +super-type or meta-type changes. + + +2009/04/24 18:29:38 phil +Fixed the lookup of generated slot functions in sub-types. +Moved some assertions to more appropriate places when a generated slot function +isn't found. + + +2009/04/20 19:54:57 phil +Disabled the new implicit copying of const reference results where the class +doesn't have a public copy ctor. + + +2009/04/18 16:53:34 phil +Fixed a problem handling __setitem__ when being used to support +multi-dimensional mappings. + + 2009/04/09 13:00:09 phil Print any exception raised by __dtor__. ChangeLog @@ -22,7 +22,7 @@ import siputils # Initialise the globals. sip_version = 0x040800 -sip_version_str = "4.8-snapshot-20090409" +sip_version_str = "4.8-snapshot-20090430" py_version = sys.hexversion >> 8 plat_py_site_dir = None plat_py_inc_dir = None configure.py @@ -301,7 +301,7 @@ ul.auto-toc { <tr><th class="docinfo-name">Contact:</th> <td><a class="first last reference" href="mailto:info@riverbankcomputing.com">info@riverbankcomputing.com</a></td></tr> <tr><th class="docinfo-name">Version:</th> -<td>4.8-snapshot-20090409</td></tr> +<td>4.8-snapshot-20090430</td></tr> <tr><th class="docinfo-name">Copyright:</th> <td>Copyright (c) 2009 Riverbank Computing Limited</td></tr> </tbody> @@ -595,7 +595,7 @@ ul.auto-toc { </div> <div class="section"> <h1><a class="toc-backref" href="#id25" id="introduction" name="introduction">1   Introduction</a></h1> -This is the reference guide for SIP 4.8-snapshot-20090409. SIP is a tool for +This is the reference guide for SIP 4.8-snapshot-20090430. SIP is a tool for automatically generating <a class="reference" href="http://www.python.org">Python</a> bindings for C and C++ libraries. SIP was originally developed in 1998 for <a class="reference" href="http://www.riverbankcomputing.com/software/pyqt/">PyQt</a> - the Python @@ -1450,7 +1450,8 @@ memory. SIP allows a class's meta-type and super-type to be explicitly specified using the <a class="reference" href="#metatype">Metatype</a> and <a class="reference" href="#supertype">Supertype</a> class annotations. SIP also allows the default meta-type and super-type to be changed for a module -using the <a class="reference" href="#defaultmetatype">%DefaultMetatype</a> and <a class="reference" href="#defaultsupertype">%DefaultSupertype</a> directives. +using the <a class="reference" href="#defaultmetatype">%DefaultMetatype</a> and <a class="reference" href="#defaultsupertype">%DefaultSupertype</a> directives. Unlike the +default super-type, the default meta-type is inherited by importing modules. If you want to use your own meta-type or super-type then they must be sub-classed from one of the SIP provided types. Your types must be registered using <a class="reference" href="#sipregisterpytype">sipRegisterPyType()</a>. This is normally done in code specified using @@ -2587,7 +2588,8 @@ specified then <tt class="docutils literal">"None"</ %DefaultMetatype dotted-name </pre> This directive is used to specify the Python type that should be used as the -meta-type for any C/C++ data type that doesn't have an explicit super-type. +meta-type for any C/C++ data type defined in the same module, and by importing +modules, that doesn't have an explicit super-type. If this is not specified then <tt class="docutils literal">sip.wrappertype</tt> is used. You can also use the <a class="reference" href="#metatype">Metatype</a> class annotation to specify the meta-type used by a particular C/C++ type. @@ -2603,7 +2605,8 @@ used by a particular C/C++ type. %DefaultSupertype dotted-name </pre> This directive is used to specify the Python type that should be used as the -super-type for any C/C++ data type that doesn't have an explicit super-type. +super-type for any C/C++ data type defined in the same module that doesn't have +an explicit super-type. If this is not specified then <tt class="docutils literal">sip.wrapper</tt> is used. You can also use the <a class="reference" href="#supertype">Supertype</a> class annotation to specify the super-type used by a particular C/C++ type. doc/sipref.html @@ -7,7 +7,7 @@ ----------------- :Contact: info@riverbankcomputing.com -:Version: 4.8-snapshot-20090409 +:Version: 4.8-snapshot-20090430 :Copyright: Copyright (c) 2009 Riverbank Computing Limited .. contents:: @@ -17,7 +17,7 @@ Introduction ============ -This is the reference guide for SIP 4.8-snapshot-20090409. SIP is a tool for +This is the reference guide for SIP 4.8-snapshot-20090430. SIP is a tool for automatically generating `Python <http://www.python.org>`__ bindings for C and C++ libraries. SIP was originally developed in 1998 for `PyQt <http://www.riverbankcomputing.com/software/pyqt/>`__ - the Python @@ -950,7 +950,8 @@ SIP allows a class's meta-type and super-type to be explicitly specified using the `Metatype`_ and `Supertype`_ class annotations. SIP also allows the default meta-type and super-type to be changed for a module -using the `%DefaultMetatype`_ and `%DefaultSupertype`_ directives. +using the `%DefaultMetatype`_ and `%DefaultSupertype`_ directives. Unlike the +default super-type, the default meta-type is inherited by importing modules. If you want to use your own meta-type or super-type then they must be sub-classed from one of the SIP provided types. Your types must be registered @@ -2209,7 +2210,8 @@ For example:: %DefaultMetatype *dotted-name* This directive is used to specify the Python type that should be used as the -meta-type for any C/C++ data type that doesn't have an explicit super-type. +meta-type for any C/C++ data type defined in the same module, and by importing +modules, that doesn't have an explicit super-type. If this is not specified then ``sip.wrappertype`` is used. @@ -2231,7 +2233,8 @@ For example:: %DefaultSupertype *dotted-name* This directive is used to specify the Python type that should be used as the -super-type for any C/C++ data type that doesn't have an explicit super-type. +super-type for any C/C++ data type defined in the same module that doesn't have +an explicit super-type. If this is not specified then ``sip.wrapper`` is used. doc/sipref.txt @@ -10198,8 +10198,12 @@ static void generateFunctionCall(classDef *cd,classDef *ocd,overDef *od, /* Make a copy if it is not a reference or it is a const reference. */ if (!isReference(res) || isConstArg(res)) { - needsNew = TRUE; - resetIsConstArg(res); + /* If it is a class then we must be able to copy it. */ + if (res->atype != class_type || !cannotCopy(res->u.cd)) + { + needsNew = TRUE; + resetIsConstArg(res); + } } } sipgen/gencode.c @@ -26,7 +26,7 @@ #define PACKAGE "sip" #endif -#define VERSION "4.8-snapshot-20090409" +#define VERSION "4.8-snapshot-20090430" /* Global variables - see sip.h for their meaning. */ sipgen/main.c @@ -92,6 +92,7 @@ #define CLASS_NO_QMETAOBJECT 0x02000000 /* It has no QMetaObject. */ #define CLASS_IS_TEMPLATE 0x04000000 /* It is a template class. */ #define CLASS_IS_DEPRECATED 0x08000000 /* It is deprecated. */ +#define CLASS_CANNOT_COPY 0x10000000 /* It cannot be copied. */ #define hasSigSlots(cd) ((cd)->classflags & CLASS_HAS_SIGSLOTS) #define setHasSigSlots(cd) ((cd)->classflags |= CLASS_HAS_SIGSLOTS) @@ -136,6 +137,8 @@ #define resetIsTemplateClass(cd) ((cd)->classflags &= ~CLASS_IS_TEMPLATE) #define isDeprecatedClass(cd) ((cd)->classflags & CLASS_IS_DEPRECATED) #define setIsDeprecatedClass(cd) ((cd)->classflags |= CLASS_IS_DEPRECATED) +#define cannotCopy(cd) ((cd)->classflags & CLASS_CANNOT_COPY) +#define setCannotCopy(cd) ((cd)->classflags |= CLASS_CANNOT_COPY) #define isPublicDtor(cd) ((cd)->classflags & SECT_IS_PUBLIC) #define setIsPublicDtor(cd) ((cd)->classflags |= SECT_IS_PUBLIC) sipgen/sip.h @@ -156,29 +156,6 @@ void transform(sipSpec *pt) } } - /* - * Set the default super-type for the main module if it doesn't have one - * explicitly set. - */ - if (pt->module->defsupertype == NULL) - { - moduleListDef *mld; - - for (mld = pt->module->allimports; mld != NULL; mld = mld->next) - { - if (mld->module->defsupertype == NULL) - continue; - - if (pt->module->defsupertype == NULL) - pt->module->defsupertype = mld->module->defsupertype; - else if (pt->module->defsupertype != mld->module->defsupertype) - fatal("The %s module has imported different default super-types %s and %s\n", - pt->module->fullname->text, - pt->module->defsupertype->text, - mld->module->defsupertype->text); - } - } - /* Check each class has been defined. */ for (cd = pt -> classes; cd != NULL; cd = cd -> next) if (cd -> iff -> module == NULL) @@ -226,8 +203,8 @@ void transform(sipSpec *pt) } /* Handle default ctors now that the argument types are resolved. */ - if (!pt -> genc) - for (cd = pt -> classes; cd != NULL; cd = cd -> next) + if (!pt->genc) + for (cd = pt->classes; cd != NULL; cd = cd->next) if (!noDefaultCtors(cd) && !isOpaque(cd) && cd->iff->type != namespace_iface) addDefaultCopyCtor(cd); @@ -1331,81 +1308,79 @@ static void transformCasts(sipSpec *pt, classDef *cd) /* - * Add a default copy ctor is required. + * Add a default copy ctor if required. */ static void addDefaultCopyCtor(classDef *cd) { - ctorDef *copyct; + ctorDef *copyct, **tailp; mroDef *mro; /* See if there is a private copy ctor in the hierarchy. */ - - copyct = NULL; - - for (mro = cd -> mro; mro != NULL; mro = mro -> next) + for (mro = cd->mro; mro != NULL; mro = mro->next) { ctorDef *ct; if (isDuplicateSuper(mro)) continue; - for (ct = mro -> cd -> ctors; ct != NULL; ct = ct -> next) + for (ct = mro->cd->ctors; ct != NULL; ct = ct->next) { argDef *ad = &ct -> pysig.args[0]; /* See if is a copy ctor. */ - if (ct -> pysig.nrArgs != 1 || ad -> nrderefs != 0 || - !isReference(ad) || ad -> atype != class_type || - ad -> u.cd != mro -> cd) - continue; + if (ct->pysig.nrArgs == 1 && ad->nrderefs == 0 && + isReference(ad) && ad->atype == class_type && + ad->u.cd == mro->cd) + break; + } - /* Stop now if the copy ctor is private. */ + if (ct != NULL) + { + /* If the copy ctor is private then the class can't be copied. */ if (isPrivateCtor(ct)) + { + setCannotCopy(cd); return; - + } + /* - * Remember if it's in the class we are dealing with. + * If the ctor is in the class itself then there is nothing to do. */ - if (mro == cd -> mro) - copyct = ct; + if (mro == cd->mro) + return; + /* Otherwise we need to create a default. */ break; } } - if (copyct == NULL) - { - ctorDef **tailp; - - /* Create a default public copy ctor. */ + /* Create a default public copy ctor. */ + copyct = sipMalloc(sizeof (ctorDef)); - copyct = sipMalloc(sizeof (ctorDef)); + copyct->ctorflags = SECT_IS_PUBLIC; + copyct->pysig.nrArgs = 1; + copyct->pysig.args[0].name = "other"; + copyct->pysig.args[0].atype = class_type; + copyct->pysig.args[0].u.cd = cd; + copyct->pysig.args[0].argflags = (ARG_IS_REF | ARG_IS_CONST | ARG_IN); + copyct->pysig.args[0].nrderefs = 0; + copyct->pysig.args[0].defval = NULL; - copyct -> ctorflags = SECT_IS_PUBLIC; - copyct -> pysig.nrArgs = 1; - copyct -> pysig.args[0].name = "other"; - copyct -> pysig.args[0].atype = class_type; - copyct -> pysig.args[0].u.cd = cd; - copyct -> pysig.args[0].argflags = (ARG_IS_REF | ARG_IS_CONST | ARG_IN); - copyct -> pysig.args[0].nrderefs = 0; - copyct -> pysig.args[0].defval = NULL; + copyct->cppsig = &copyct->pysig; + copyct->exceptions = NULL; + copyct->methodcode = NULL; + copyct->prehook = NULL; + copyct->posthook = NULL; + copyct->next = NULL; - copyct -> cppsig = &copyct -> pysig; - copyct -> exceptions = NULL; - copyct -> methodcode = NULL; - copyct -> prehook = NULL; - copyct -> posthook = NULL; - copyct -> next = NULL; - - if (isDeprecatedClass(cd)) - setIsDeprecatedCtor(copyct); + if (isDeprecatedClass(cd)) + setIsDeprecatedCtor(copyct); - /* Append it to the list. */ - for (tailp = &cd -> ctors; *tailp != NULL; tailp = &(*tailp) -> next) - ; + /* Append it to the list. */ + for (tailp = &cd->ctors; *tailp != NULL; tailp = &(*tailp)->next) + ; - *tailp = copyct; - } + *tailp = copyct; } sipgen/transform.c @@ -83,7 +83,7 @@ static void *createUniversalSlot(sipWrapper *txSelf, const char *sig, */ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs) { - PyObject *sa, *oxtype, *oxvalue, *oxtb, *sfunc, *newmeth, *sref; + PyObject *sa, *oxtype, *oxvalue, *oxtb, *sfunc, *sref; /* Keep some compilers quiet. */ oxtype = oxvalue = oxtb = NULL; @@ -145,9 +145,6 @@ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs) Py_XDECREF(sref); return NULL; } - - /* Make sure we garbage collect the new method. */ - newmeth = sfunc; } else if (slot -> name != NULL) { @@ -162,17 +159,15 @@ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs) */ PyErr_Format(PyExc_NameError,"Invalid slot %s",mname); + Py_XDECREF(sfunc); Py_XDECREF(sref); return NULL; } - - /* Make sure we garbage collect the new method. */ - newmeth = sfunc; } else { - sfunc = slot -> pyobj; - newmeth = NULL; + sfunc = slot->pyobj; + Py_INCREF(sfunc); } /* @@ -188,9 +183,9 @@ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs) { PyObject *nsa, *xtype, *xvalue, *xtb, *resobj; - if ((resobj = PyEval_CallObject(sfunc,sa)) != NULL) + if ((resobj = PyEval_CallObject(sfunc, sa)) != NULL) { - Py_XDECREF(newmeth); + Py_DECREF(sfunc); Py_XDECREF(sref); /* Remove any previous exception. */ @@ -281,7 +276,7 @@ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs) sa = nsa; } - Py_XDECREF(newmeth); + Py_DECREF(sfunc); Py_XDECREF(sref); Py_DECREF(sa); siplib/qtlib.c @@ -51,7 +51,7 @@ extern "C" { * Define the SIP version number. */ #define SIP_VERSION 0x040800 -#define SIP_VERSION_STR "4.8-snapshot-20090409" +#define SIP_VERSION_STR "4.8-snapshot-20090430" /* siplib/sip.h @@ -360,6 +360,7 @@ static void addClassSlots(sipWrapperType *wt, sipClassTypeDef *ctd); static void addTypeSlots(PyTypeObject *to, PyNumberMethods *nb, PySequenceMethods *sq, PyMappingMethods *mp, sipPySlotDef *slots); static void *findSlot(PyObject *self, sipPySlotType st); +static void *findSlotInType(sipPySlotDef *psd, sipPySlotType st); static int objobjargprocSlot(PyObject *self, PyObject *arg1, PyObject *arg2, sipPySlotType st); static int ssizeobjargprocSlot(PyObject *self, SIP_SSIZE_T arg1, @@ -6377,21 +6378,64 @@ static sipClassTypeDef *getClassType(const sipEncodedClassDef *enc, */ static void *findSlot(PyObject *self, sipPySlotType st) { - sipPySlotDef *psd; + void *slot; PyTypeObject *py_type = Py_TYPE(self); - /* If it is not a wrapper then it must be an enum. */ + /* See if it is a wrapper. */ if (PyObject_TypeCheck((PyObject *)py_type, &sipWrapperType_Type)) - psd = ((sipClassTypeDef *)((sipWrapperType *)(py_type))->type)->ctd_pyslots; + { + sipClassTypeDef *ctd; + + ctd = (sipClassTypeDef *)((sipWrapperType *)(py_type))->type; + + if (ctd->ctd_pyslots != NULL) + slot = findSlotInType(ctd->ctd_pyslots, st); + else + slot = NULL; + + if (slot == NULL) + { + sipEncodedClassDef *sup; + + /* Search any super-types. */ + if ((sup = ctd->ctd_supers) != NULL) + { + sipClassTypeDef *sup_ctd; + + do + { + sup_ctd = getClassType(sup, ctd->ctd_base.td_module); + + if (sup_ctd->ctd_pyslots != NULL) + slot = findSlotInType(sup_ctd->ctd_pyslots, st); + } + while (slot == NULL && !sup++->sc_flag); + } + } + } else { + sipEnumTypeDef *etd; + + /* If it is not a wrapper then it must be an enum. */ assert(PyObject_TypeCheck((PyObject *)py_type, &sipEnumType_Type)); - psd = ((sipEnumTypeDef *)((sipEnumTypeObject *)(py_type))->type)->etd_pyslots; + etd = (sipEnumTypeDef *)((sipEnumTypeObject *)(py_type))->type; + + assert(etd->etd_pyslots != NULL); + + slot = findSlotInType(etd->etd_pyslots, st); } - assert(psd != NULL); + return slot; +} + +/* + * Find a particular slot function in a particular type. + */ +static void *findSlotInType(sipPySlotDef *psd, sipPySlotType st) +{ while (psd->psd_func != NULL) { if (psd->psd_type == st) @@ -6400,7 +6444,6 @@ static void *findSlot(PyObject *self, sipPySlotType st) ++psd; } - /* This should never happen. */ return NULL; } @@ -6419,58 +6462,47 @@ static void *getPtrTypeDef(sipSimpleWrapper *self, const sipClassTypeDef **ctd) /* * Handle an objobjargproc slot. */ -static int objobjargprocSlot(PyObject *self,PyObject *arg1,PyObject *arg2, +static int objobjargprocSlot(PyObject *self, PyObject *arg1, PyObject *arg2, sipPySlotType st) { - int (*f)(PyObject *,PyObject *); - PyObject *args; + int (*f)(PyObject *, PyObject *); int res; - /* - * Slot handlers require a single PyObject *. The second argument is - * optional. - */ - if (arg2 == NULL) - args = arg1; - else if (PyTuple_Check(arg1)) - { - int i; + f = (int (*)(PyObject *, PyObject *))findSlot(self, st); - /* It's already a tuple so we need to copy it and append the value. */ - if ((args = PyTuple_New(PyTuple_GET_SIZE(arg1) + 1)) == NULL) - return -1; + if (f != NULL) + { + PyObject *args; - for (i = 0; i < PyTuple_GET_SIZE(arg1); ++i) + /* + * Slot handlers require a single PyObject *. The second argument is + * optional. + */ + if (arg2 == NULL) { - PyObject *o = PyTuple_GET_ITEM(arg1,i); - - PyTuple_SET_ITEM(args,i,o); - Py_INCREF(o); + args = arg1; + Py_INCREF(args); } - - PyTuple_SET_ITEM(args,i,arg2); - Py_INCREF(arg2); - } - else - { + else + { #if PY_VERSION_HEX >= 0x02040000 - args = PyTuple_Pack(2, arg1, arg2); + args = PyTuple_Pack(2, arg1, arg2); #else - args = Py_BuildValue("(OO)", arg1, arg2); + args = Py_BuildValue("(OO)", arg1, arg2); #endif - if (args == NULL) - return -1; - } - - f = (int (*)(PyObject *,PyObject *))findSlot(self, st); - - res = f(self,args); + if (args == NULL) + return -1; + } - if (arg2 != NULL) - { + res = f(self, args); Py_DECREF(args); } + else + { + PyErr_SetNone(PyExc_NotImplementedError); + res = -1; + } return res; } @@ -6482,37 +6514,45 @@ static int objobjargprocSlot(PyObject *self,PyObject *arg1,PyObject *arg2, static int ssizeobjargprocSlot(PyObject *self, SIP_SSIZE_T arg1, PyObject *arg2, sipPySlotType st) { - int (*f)(PyObject *,PyObject *); - PyObject *args; + int (*f)(PyObject *, PyObject *); int res; - /* - * Slot handlers require a single PyObject *. The second argument is - * optional. - */ - if (arg2 == NULL) + f = (int (*)(PyObject *, PyObject *))findSlot(self, st); + + if (f != NULL) + { + PyObject *args; + + /* + * Slot handlers require a single PyObject *. The second argument is + * optional. + */ + if (arg2 == NULL) #if PY_MAJOR_VERSION >= 3 - args = PyLong_FromSsize_t(arg1); + args = PyLong_FromSsize_t(arg1); #elif PY_VERSION_HEX >= 0x02050000 - args = PyInt_FromSsize_t(arg1); + args = PyInt_FromSsize_t(arg1); #else - args = PyInt_FromLong(arg1); + args = PyInt_FromLong(arg1); #endif else #if PY_VERSION_HEX >= 0x02050000 - args = Py_BuildValue("(nO)", arg1, arg2); + args = Py_BuildValue("(nO)", arg1, arg2); #else - args = Py_BuildValue("(iO)", arg1, arg2); + args = Py_BuildValue("(iO)", arg1, arg2); #endif - if (args == NULL) - return -1; - - f = (int (*)(PyObject *,PyObject *))findSlot(self,st); - - res = f(self,args); + if (args == NULL) + return -1; - Py_DECREF(args); + res = f(self, args); + Py_DECREF(args); + } + else + { + PyErr_SetNone(PyExc_NotImplementedError); + res = -1; + } return res; } @@ -7656,7 +7696,9 @@ static PyObject *slot_call(PyObject *self,PyObject *args,PyObject *kw) { PyObject *(*f)(PyObject *,PyObject *); - f = (PyObject *(*)(PyObject *,PyObject *))findSlot(self,call_slot); + f = (PyObject *(*)(PyObject *,PyObject *))findSlot(self, call_slot); + + assert(f != NULL); return f(self,args); } @@ -7681,7 +7723,9 @@ static PyObject *slot_sq_item(PyObject *self, SIP_SSIZE_T n) if (arg == NULL) return NULL; - f = (PyObject *(*)(PyObject *,PyObject *))findSlot(self,getitem_slot); + f = (PyObject *(*)(PyObject *,PyObject *))findSlot(self, getitem_slot); + + assert(f != NULL); res = f(self,arg); @@ -7694,10 +7738,11 @@ static PyObject *slot_sq_item(PyObject *self, SIP_SSIZE_T n) /* * The mapping type assign subscript slot. */ -static int slot_mp_ass_subscript(PyObject *self,PyObject *key, +static int slot_mp_ass_subscript(PyObject *self, PyObject *key, PyObject *value) { - return objobjargprocSlot(self,key,value,(value != NULL ? setitem_slot : delitem_slot)); + return objobjargprocSlot(self, key, value, + (value != NULL ? setitem_slot : delitem_slot)); } @@ -7706,14 +7751,15 @@ static int slot_mp_ass_subscript(PyObject *self,PyObject *key, */ static int slot_sq_ass_item(PyObject *self, SIP_SSIZE_T i, PyObject *o) { - return ssizeobjargprocSlot(self, i, o, (o != NULL ? setitem_slot : delitem_slot)); + return ssizeobjargprocSlot(self, i, o, + (o != NULL ? setitem_slot : delitem_slot)); } /* * The type rich compare slot. */ -static PyObject *slot_richcompare(PyObject *self,PyObject *arg,int op) +static PyObject *slot_richcompare(PyObject *self, PyObject *arg, int op) { PyObject *(*f)(PyObject *,PyObject *); sipPySlotType st; @@ -7747,13 +7793,13 @@ static PyObject *slot_richcompare(PyObject *self,PyObject *arg,int op) } /* It might not exist if not all the above have been implemented. */ - if ((f = (PyObject *(*)(PyObject *,PyObject *))findSlot(self,st)) == NULL) + if ((f = (PyObject *(*)(PyObject *,PyObject *))findSlot(self, st)) == NULL) { Py_INCREF(Py_NotImplemented); return Py_NotImplemented; } - return f(self,arg); + return f(self, arg); } siplib/siplib.c a4721a75c79e2875612e2511da24304099122935 Kevin Watters kevinwatters@gmail.com http://github.com/kevinw/sip/commit/de9650f5d9cdf1545039207f9b3e345931585067 de9650f5d9cdf1545039207f9b3e345931585067

2009-05-11T07:26:12-07:00

sip-4.8-snapshot-20090430 cb8532a58c93044153bafda0d7a01e0f87b091c6 Kevin Watters kevinwatters@gmail.com