diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-27 04:32:20 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-27 04:32:20 +0400 |
commit | 069d21dddfef3361068afa987cc618f8fdaf48c3 (patch) | |
tree | 60770a4941397178ea254c32f4f1622043b829c8 /source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp | |
parent | 1ed4d4cbfbd3bf4768935b454afba88eb42ea14e (diff) |
Made the Freestyle Python API compatible with Python 3.
Diffstat (limited to 'source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp | 152 |
1 files changed, 56 insertions, 96 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp index b80ff013c62..be0062644fd 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp @@ -23,9 +23,9 @@ extern "C" { static int UnaryPredicate1D___init__(BPy_UnaryPredicate1D *self, PyObject *args, PyObject *kwds); static void UnaryPredicate1D___dealloc__(BPy_UnaryPredicate1D *self); static PyObject * UnaryPredicate1D___repr__(BPy_UnaryPredicate1D *self); +static PyObject * UnaryPredicate1D___call__( BPy_UnaryPredicate1D *self, PyObject *args, PyObject *kwds); static PyObject * UnaryPredicate1D_getName( BPy_UnaryPredicate1D *self, PyObject *args); -static PyObject * UnaryPredicate1D___call__( BPy_UnaryPredicate1D *self, PyObject *args, PyObject *kwds); /*----------------------UnaryPredicate1D instance definitions ----------------------------*/ static PyMethodDef BPy_UnaryPredicate1D_methods[] = { @@ -36,143 +36,103 @@ static PyMethodDef BPy_UnaryPredicate1D_methods[] = { /*-----------------------BPy_UnaryPredicate1D type definition ------------------------------*/ PyTypeObject UnaryPredicate1D_Type = { - PyObject_HEAD_INIT( NULL ) - 0, /* ob_size */ - "UnaryPredicate1D", /* tp_name */ - sizeof( BPy_UnaryPredicate1D ), /* tp_basicsize */ - 0, /* tp_itemsize */ - - /* methods */ - (destructor)UnaryPredicate1D___dealloc__, /* tp_dealloc */ - NULL, /* printfunc tp_print; */ - NULL, /* getattrfunc tp_getattr; */ - NULL, /* setattrfunc tp_setattr; */ - NULL, /* tp_compare */ - (reprfunc)UnaryPredicate1D___repr__, /* tp_repr */ - - /* Method suites for standard classes */ - - NULL, /* PyNumberMethods *tp_as_number; */ - NULL, /* PySequenceMethods *tp_as_sequence; */ - NULL, /* PyMappingMethods *tp_as_mapping; */ - - /* More standard operations (here for binary compatibility) */ - - NULL, /* hashfunc tp_hash; */ - (ternaryfunc)UnaryPredicate1D___call__, /* ternaryfunc tp_call; */ - NULL, /* reprfunc tp_str; */ - NULL, /* getattrofunc tp_getattro; */ - NULL, /* setattrofunc tp_setattro; */ - - /* Functions to access object as input/output buffer */ - NULL, /* PyBufferProcs *tp_as_buffer; */ - - /*** Flags to define presence of optional/expanded features ***/ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* long tp_flags; */ - - NULL, /* char *tp_doc; Documentation string */ - /*** Assigned meaning in release 2.0 ***/ - /* call function for all accessible objects */ - NULL, /* traverseproc tp_traverse; */ - - /* delete references to contained objects */ - NULL, /* inquiry tp_clear; */ - - /*** Assigned meaning in release 2.1 ***/ - /*** rich comparisons ***/ - NULL, /* richcmpfunc tp_richcompare; */ - - /*** weak reference enabler ***/ - 0, /* long tp_weaklistoffset; */ - - /*** Added in release 2.2 ***/ - /* Iterators */ - NULL, /* getiterfunc tp_iter; */ - NULL, /* iternextfunc tp_iternext; */ - - /*** Attribute descriptor and subclassing stuff ***/ - BPy_UnaryPredicate1D_methods, /* struct PyMethodDef *tp_methods; */ - NULL, /* struct PyMemberDef *tp_members; */ - NULL, /* struct PyGetSetDef *tp_getset; */ - NULL, /* struct _typeobject *tp_base; */ - NULL, /* PyObject *tp_dict; */ - NULL, /* descrgetfunc tp_descr_get; */ - NULL, /* descrsetfunc tp_descr_set; */ - 0, /* long tp_dictoffset; */ - (initproc)UnaryPredicate1D___init__, /* initproc tp_init; */ - NULL, /* allocfunc tp_alloc; */ - PyType_GenericNew, /* newfunc tp_new; */ - - /* Low-level free-memory routine */ - NULL, /* freefunc tp_free; */ - - /* For PyObject_IS_GC */ - NULL, /* inquiry tp_is_gc; */ - NULL, /* PyObject *tp_bases; */ - - /* method resolution order */ - NULL, /* PyObject *tp_mro; */ - NULL, /* PyObject *tp_cache; */ - NULL, /* PyObject *tp_subclasses; */ - NULL, /* PyObject *tp_weaklist; */ - NULL + PyVarObject_HEAD_INIT(NULL, 0) + "UnaryPredicate1D", /* tp_name */ + sizeof(BPy_UnaryPredicate1D), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor)UnaryPredicate1D___dealloc__, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_reserved */ + (reprfunc)UnaryPredicate1D___repr__, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + (ternaryfunc)UnaryPredicate1D___call__, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "UnaryPredicate1D objects", /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + BPy_UnaryPredicate1D_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)UnaryPredicate1D___init__, /* tp_init */ + 0, /* tp_alloc */ + PyType_GenericNew, /* tp_new */ }; //-------------------MODULE INITIALIZATION-------------------------------- -PyMODINIT_FUNC UnaryPredicate1D_Init( PyObject *module ) +int UnaryPredicate1D_Init( PyObject *module ) { if( module == NULL ) - return; + return -1; if( PyType_Ready( &UnaryPredicate1D_Type ) < 0 ) - return; + return -1; Py_INCREF( &UnaryPredicate1D_Type ); PyModule_AddObject(module, "UnaryPredicate1D", (PyObject *)&UnaryPredicate1D_Type); if( PyType_Ready( &ContourUP1D_Type ) < 0 ) - return; + return -1; Py_INCREF( &ContourUP1D_Type ); PyModule_AddObject(module, "ContourUP1D", (PyObject *)&ContourUP1D_Type); if( PyType_Ready( &DensityLowerThanUP1D_Type ) < 0 ) - return; + return -1; Py_INCREF( &DensityLowerThanUP1D_Type ); PyModule_AddObject(module, "DensityLowerThanUP1D", (PyObject *)&DensityLowerThanUP1D_Type); if( PyType_Ready( &EqualToChainingTimeStampUP1D_Type ) < 0 ) - return; + return -1; Py_INCREF( &EqualToChainingTimeStampUP1D_Type ); PyModule_AddObject(module, "EqualToChainingTimeStampUP1D", (PyObject *)&EqualToChainingTimeStampUP1D_Type); if( PyType_Ready( &EqualToTimeStampUP1D_Type ) < 0 ) - return; + return -1; Py_INCREF( &EqualToTimeStampUP1D_Type ); PyModule_AddObject(module, "EqualToTimeStampUP1D", (PyObject *)&EqualToTimeStampUP1D_Type); if( PyType_Ready( &ExternalContourUP1D_Type ) < 0 ) - return; + return -1; Py_INCREF( &ExternalContourUP1D_Type ); PyModule_AddObject(module, "ExternalContourUP1D", (PyObject *)&ExternalContourUP1D_Type); if( PyType_Ready( &FalseUP1D_Type ) < 0 ) - return; + return -1; Py_INCREF( &FalseUP1D_Type ); PyModule_AddObject(module, "FalseUP1D", (PyObject *)&FalseUP1D_Type); if( PyType_Ready( &QuantitativeInvisibilityUP1D_Type ) < 0 ) - return; + return -1; Py_INCREF( &QuantitativeInvisibilityUP1D_Type ); PyModule_AddObject(module, "QuantitativeInvisibilityUP1D", (PyObject *)&QuantitativeInvisibilityUP1D_Type); if( PyType_Ready( &ShapeUP1D_Type ) < 0 ) - return; + return -1; Py_INCREF( &ShapeUP1D_Type ); PyModule_AddObject(module, "ShapeUP1D", (PyObject *)&ShapeUP1D_Type); if( PyType_Ready( &TrueUP1D_Type ) < 0 ) - return; + return -1; Py_INCREF( &TrueUP1D_Type ); PyModule_AddObject(module, "TrueUP1D", (PyObject *)&TrueUP1D_Type); + + return 0; } //------------------------INSTANCE METHODS ---------------------------------- @@ -190,19 +150,19 @@ void UnaryPredicate1D___dealloc__(BPy_UnaryPredicate1D* self) { if (self->up1D) delete self->up1D; - self->ob_type->tp_free((PyObject*)self); + Py_TYPE(self)->tp_free((PyObject*)self); } PyObject * UnaryPredicate1D___repr__(BPy_UnaryPredicate1D* self) { - return PyString_FromFormat("type: %s - address: %p", self->up1D->getName().c_str(), self->up1D ); + return PyUnicode_FromFormat("type: %s - address: %p", self->up1D->getName().c_str(), self->up1D ); } PyObject * UnaryPredicate1D_getName( BPy_UnaryPredicate1D *self, PyObject *args) { - return PyString_FromString( self->up1D->getName().c_str() ); + return PyUnicode_FromFormat( self->up1D->getName().c_str() ); } static PyObject * UnaryPredicate1D___call__( BPy_UnaryPredicate1D *self, PyObject *args, PyObject *kwds) |