From: <wsf...@us...> - 2008-09-18 13:16:05
|
Revision: 10867 http://swig.svn.sourceforge.net/swig/?rev=10867&view=rev Author: wsfulton Date: 2008-09-18 20:16:03 +0000 (Thu, 18 Sep 2008) Log Message: ----------- pointer display correction Modified Paths: -------------- trunk/Lib/python/pyrun.swg Modified: trunk/Lib/python/pyrun.swg =================================================================== --- trunk/Lib/python/pyrun.swg 2008-09-18 14:52:52 UTC (rev 10866) +++ trunk/Lib/python/pyrun.swg 2008-09-18 20:16:03 UTC (rev 10867) @@ -384,7 +384,7 @@ { const char *name = SWIG_TypePrettyName(v->ty); PyObject *hex = PySwigObject_hex(v); - PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at 0x%U>", name, hex); + PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", name, hex); Py_DECREF(hex); if (v->next) { #ifdef METH_NOARGS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2009-01-08 23:29:37
|
Revision: 11044 http://swig.svn.sourceforge.net/swig/?rev=11044&view=rev Author: wsfulton Date: 2009-01-08 23:29:33 +0000 (Thu, 08 Jan 2009) Log Message: ----------- minor formatting Modified Paths: -------------- trunk/Lib/python/pyrun.swg Modified: trunk/Lib/python/pyrun.swg =================================================================== --- trunk/Lib/python/pyrun.swg 2009-01-08 19:46:38 UTC (rev 11043) +++ trunk/Lib/python/pyrun.swg 2009-01-08 23:29:33 UTC (rev 11044) @@ -682,12 +682,12 @@ if (!type_init) { const PyTypeObject tmp = { - /* PyOjbect header changed in Python 3 */ + /* PyOjbect header changed in Python 3 */ #if PY_VERSION_HEX >= 0x03000000 - PyVarObject_HEAD_INIT(&PyType_Type, 0) + PyVarObject_HEAD_INIT(&PyType_Type, 0) #else - PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ #endif (char *)"SwigPyObject", /* tp_name */ sizeof(SwigPyObject), /* tp_basicsize */ @@ -732,11 +732,11 @@ 0, /* tp_alloc */ 0, /* tp_new */ 0, /* tp_free */ - 0, /* tp_is_gc */ + 0, /* tp_is_gc */ 0, /* tp_bases */ 0, /* tp_mro */ 0, /* tp_cache */ - 0, /* tp_subclasses */ + 0, /* tp_subclasses */ 0, /* tp_weaklist */ #endif #if PY_VERSION_HEX >= 0x02030000 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2009-02-07 23:44:16
|
Revision: 11117 http://swig.svn.sourceforge.net/swig/?rev=11117&view=rev Author: wsfulton Date: 2009-02-07 23:44:12 +0000 (Sat, 07 Feb 2009) Log Message: ----------- remove gcc warning when using -Wunreachable-code Modified Paths: -------------- trunk/Lib/python/pyrun.swg Modified: trunk/Lib/python/pyrun.swg =================================================================== --- trunk/Lib/python/pyrun.swg 2009-02-07 20:25:54 UTC (rev 11116) +++ trunk/Lib/python/pyrun.swg 2009-02-07 23:44:12 UTC (rev 11117) @@ -1550,10 +1550,12 @@ void *result; if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) { PyErr_Clear(); - if (flags & SWIG_POINTER_EXCEPTION) { +#if SWIG_POINTER_EXCEPTION + if (flags) { SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj); SWIG_Python_ArgFail(argnum); } +#endif } return result; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bh...@us...> - 2009-03-16 11:10:43
|
Revision: 11151 http://swig.svn.sourceforge.net/swig/?rev=11151&view=rev Author: bhy Date: 2009-03-16 11:10:29 +0000 (Mon, 16 Mar 2009) Log Message: ----------- Remove an nonsense Py_INCREF. Modified Paths: -------------- trunk/Lib/python/pyrun.swg Modified: trunk/Lib/python/pyrun.swg =================================================================== --- trunk/Lib/python/pyrun.swg 2009-03-12 20:41:56 UTC (rev 11150) +++ trunk/Lib/python/pyrun.swg 2009-03-16 11:10:29 UTC (rev 11151) @@ -1234,7 +1234,6 @@ } else { #if PY_VERSION_HEX >= 0x03000000 inst = PyBaseObject_Type.tp_new((PyTypeObject*) data->newargs, Py_None, Py_None); - Py_INCREF(data->newargs); PyObject_SetAttr(inst, SWIG_This(), swig_this); Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG; #else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bh...@us...> - 2009-04-29 12:05:44
|
Revision: 11194 http://swig.svn.sourceforge.net/swig/?rev=11194&view=rev Author: bhy Date: 2009-04-29 12:05:33 +0000 (Wed, 29 Apr 2009) Log Message: ----------- fix of unclear comment regarding Python 3 tp_compare removal Modified Paths: -------------- trunk/Lib/python/pyrun.swg Modified: trunk/Lib/python/pyrun.swg =================================================================== --- trunk/Lib/python/pyrun.swg 2009-04-29 12:00:38 UTC (rev 11193) +++ trunk/Lib/python/pyrun.swg 2009-04-29 12:05:33 UTC (rev 11194) @@ -708,7 +708,7 @@ #endif (setattrfunc)0, /* tp_setattr */ #if PY_VERSION_HEX >= 0x03000000 - 0, /* tp_reserved in 3.0.1 */ + 0, /* tp_reserved in 3.0.1, tp_compare in 3.0.0 but not used */ #else (cmpfunc)SwigPyObject_compare, /* tp_compare */ #endif @@ -1236,9 +1236,12 @@ } } else { #if PY_VERSION_HEX >= 0x03000000 + fprintf(stderr, "<<<<"); inst = PyBaseObject_Type.tp_new((PyTypeObject*) data->newargs, Py_None, Py_None); PyObject_SetAttr(inst, SWIG_This(), swig_this); Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG; + fprintf(stderr, ">>>>"); + #else PyObject *dict = PyDict_New(); PyDict_SetItem(dict, SWIG_This(), swig_this); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ol...@us...> - 2009-04-29 23:59:07
|
Revision: 11197 http://swig.svn.sourceforge.net/swig/?rev=11197&view=rev Author: olly Date: 2009-04-29 23:59:06 +0000 (Wed, 29 Apr 2009) Log Message: ----------- Remove two accidentally committed debug fprintf() calls. Modified Paths: -------------- trunk/Lib/python/pyrun.swg Modified: trunk/Lib/python/pyrun.swg =================================================================== --- trunk/Lib/python/pyrun.swg 2009-04-29 17:58:32 UTC (rev 11196) +++ trunk/Lib/python/pyrun.swg 2009-04-29 23:59:06 UTC (rev 11197) @@ -1236,12 +1236,9 @@ } } else { #if PY_VERSION_HEX >= 0x03000000 - fprintf(stderr, "<<<<"); inst = PyBaseObject_Type.tp_new((PyTypeObject*) data->newargs, Py_None, Py_None); PyObject_SetAttr(inst, SWIG_This(), swig_this); Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG; - fprintf(stderr, ">>>>"); - #else PyObject *dict = PyDict_New(); PyDict_SetItem(dict, SWIG_This(), swig_this); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2009-08-12 00:22:53
|
Revision: 11537 http://swig.svn.sourceforge.net/swig/?rev=11537&view=rev Author: wsfulton Date: 2009-08-12 00:22:47 +0000 (Wed, 12 Aug 2009) Log Message: ----------- Fix seg fault in SWIG_Python_ConvertFunctionPtr() for invalid values Modified Paths: -------------- trunk/Lib/python/pyrun.swg Modified: trunk/Lib/python/pyrun.swg =================================================================== --- trunk/Lib/python/pyrun.swg 2009-08-11 22:53:32 UTC (rev 11536) +++ trunk/Lib/python/pyrun.swg 2009-08-12 00:22:47 UTC (rev 11537) @@ -1163,10 +1163,10 @@ /* here we get the method pointer for callbacks */ const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0; - if (desc) { + if (desc) desc = ty ? SWIG_UnpackVoidPtr(desc + 10, &vptr, ty->name) : 0; - if (!desc) return SWIG_ERROR; - } + if (!desc) + return SWIG_ERROR; if (ty) { swig_cast_info *tc = SWIG_TypeCheck(desc,ty); if (tc) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2011-04-03 18:11:45
|
Revision: 12600 http://swig.svn.sourceforge.net/swig/?rev=12600&view=rev Author: wsfulton Date: 2011-04-03 18:11:39 +0000 (Sun, 03 Apr 2011) Log Message: ----------- Fix Python C wrapper compilation Modified Paths: -------------- trunk/Lib/python/pyrun.swg Modified: trunk/Lib/python/pyrun.swg =================================================================== --- trunk/Lib/python/pyrun.swg 2011-04-03 16:56:32 UTC (rev 12599) +++ trunk/Lib/python/pyrun.swg 2011-04-03 18:11:39 UTC (rev 12600) @@ -167,8 +167,8 @@ } if (!PyTuple_Check(args)) { if (min <= 1 && max >= 1) { + register int i; objs[0] = args; - register int i; for (i = 1; i < max; ++i) { objs[i] = 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2011-04-04 06:38:20
|
Revision: 12606 http://swig.svn.sourceforge.net/swig/?rev=12606&view=rev Author: wsfulton Date: 2011-04-04 06:38:14 +0000 (Mon, 04 Apr 2011) Log Message: ----------- Fix warning in wrappers (Python > 3.0) - SF# 3239071 Modified Paths: -------------- trunk/Lib/python/pyrun.swg Modified: trunk/Lib/python/pyrun.swg =================================================================== --- trunk/Lib/python/pyrun.swg 2011-04-03 20:02:08 UTC (rev 12605) +++ trunk/Lib/python/pyrun.swg 2011-04-04 06:38:14 UTC (rev 12606) @@ -1541,14 +1541,12 @@ SWIGRUNTIME void SWIG_Python_SetModule(swig_module_info *swig_module) { - static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} };/* Sentinel */ - #if PY_VERSION_HEX >= 0x03000000 /* Add a dummy module object into sys.modules */ PyObject *module = PyImport_AddModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION); #else - PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, - swig_empty_runtime_method_table); + static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} }; /* Sentinel */ + PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, swig_empty_runtime_method_table); #endif PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule); if (pointer && module) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2011-04-11 19:22:52
|
Revision: 12632 http://swig.svn.sourceforge.net/swig/?rev=12632&view=rev Author: wsfulton Date: 2011-04-11 19:22:45 +0000 (Mon, 11 Apr 2011) Log Message: ----------- Work around anti-aliasing warning/problem with gcc Modified Paths: -------------- trunk/Lib/python/pyrun.swg Modified: trunk/Lib/python/pyrun.swg =================================================================== --- trunk/Lib/python/pyrun.swg 2011-04-11 18:45:07 UTC (rev 12631) +++ trunk/Lib/python/pyrun.swg 2011-04-11 19:22:45 UTC (rev 12632) @@ -485,11 +485,7 @@ Py_INCREF(Py_NotImplemented); return Py_NotImplemented; } - if( (SwigPyObject_compare(v, w)==0) == (op == Py_EQ) ) - res = Py_True; - else - res = Py_False; - Py_INCREF(res); + res = PyBool_FromLong( (SwigPyObject_compare(v, w)==0) == (op == Py_EQ) ? 1 : 0); return res; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2011-05-13 05:59:04
|
Revision: 12662 http://swig.svn.sourceforge.net/swig/?rev=12662&view=rev Author: wsfulton Date: 2011-05-13 05:58:58 +0000 (Fri, 13 May 2011) Log Message: ----------- Remove a compiler warning for builtin Modified Paths: -------------- trunk/Lib/python/pyrun.swg Modified: trunk/Lib/python/pyrun.swg =================================================================== --- trunk/Lib/python/pyrun.swg 2011-05-12 21:07:57 UTC (rev 12661) +++ trunk/Lib/python/pyrun.swg 2011-05-13 05:58:58 UTC (rev 12662) @@ -1070,6 +1070,7 @@ return (SwigPyObject *) pyobj; #ifdef SWIGPYTHON_BUILTIN + (void)obj; # ifdef PyWeakref_CheckProxy if (PyWeakref_CheckProxy(pyobj)) { pyobj = PyWeakref_GET_OBJECT(pyobj); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2012-03-13 07:07:12
|
Revision: 12915 http://swig.svn.sourceforge.net/swig/?rev=12915&view=rev Author: wsfulton Date: 2012-03-13 07:07:01 +0000 (Tue, 13 Mar 2012) Log Message: ----------- Show as 'unknown type' instead of seg faulting in the unusual event that type information is not set. Modified Paths: -------------- trunk/Lib/python/pyrun.swg Modified: trunk/Lib/python/pyrun.swg =================================================================== --- trunk/Lib/python/pyrun.swg 2012-02-27 18:29:50 UTC (rev 12914) +++ trunk/Lib/python/pyrun.swg 2012-03-13 07:07:01 UTC (rev 12915) @@ -429,7 +429,7 @@ #endif { const char *name = SWIG_TypePrettyName(v->ty); - PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", name, (void *)v); + PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", (name ? name : "unknown"), (void *)v); if (v->next) { # ifdef METH_NOARGS PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2012-08-15 22:35:30
|
Revision: 13618 http://swig.svn.sourceforge.net/swig/?rev=13618&view=rev Author: wsfulton Date: 2012-08-15 22:35:24 +0000 (Wed, 15 Aug 2012) Log Message: ----------- Better error handling in SWIG_Python_NewShadowInstance and SWIG_Python_NewPointerObj to fix seg fault as mentioned on swig-devel mailing list email thread - 'Fix python3 abc set' Modified Paths: -------------- trunk/Lib/python/pyrun.swg Modified: trunk/Lib/python/pyrun.swg =================================================================== --- trunk/Lib/python/pyrun.swg 2012-08-15 19:57:11 UTC (rev 13617) +++ trunk/Lib/python/pyrun.swg 2012-08-15 22:35:24 UTC (rev 13618) @@ -1331,23 +1331,29 @@ } else { #if PY_VERSION_HEX >= 0x03000000 inst = PyBaseObject_Type.tp_new((PyTypeObject*) data->newargs, Py_None, Py_None); - PyObject_SetAttr(inst, SWIG_This(), swig_this); - Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG; + if (inst) { + PyObject_SetAttr(inst, SWIG_This(), swig_this); + Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG; + } #else PyObject *dict = PyDict_New(); - PyDict_SetItem(dict, SWIG_This(), swig_this); - inst = PyInstance_NewRaw(data->newargs, dict); - Py_DECREF(dict); + if (dict) { + PyDict_SetItem(dict, SWIG_This(), swig_this); + inst = PyInstance_NewRaw(data->newargs, dict); + Py_DECREF(dict); + } #endif } return inst; #else #if (PY_VERSION_HEX >= 0x02010000) - PyObject *inst; + PyObject *inst = 0; PyObject *dict = PyDict_New(); - PyDict_SetItem(dict, SWIG_This(), swig_this); - inst = PyInstance_NewRaw(data->newargs, dict); - Py_DECREF(dict); + if (dict) { + PyDict_SetItem(dict, SWIG_This(), swig_this); + inst = PyInstance_NewRaw(data->newargs, dict); + Py_DECREF(dict); + } return (PyObject *) inst; #else PyInstanceObject *inst = PyObject_NEW(PyInstanceObject, &PyInstance_Type); @@ -1454,12 +1460,10 @@ assert(!(flags & SWIG_BUILTIN_TP_INIT)); robj = SwigPyObject_New(ptr, type, own); - if (clientdata && !(flags & SWIG_POINTER_NOSHADOW)) { + if (robj && clientdata && !(flags & SWIG_POINTER_NOSHADOW)) { PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj); - if (inst) { - Py_DECREF(robj); - robj = inst; - } + Py_DECREF(robj); + robj = inst; } return robj; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |