Made the Freestyle Python API compatible with Python 3.
[blender.git] / source / blender / freestyle / intern / python / BPy_BinaryPredicate1D.cpp
index 1f38aa42096f4b4a90e114c41fe0f138e43cc770..384aafeb56762a60ec82d0c586b52ab0ce1dea92 100644 (file)
@@ -25,131 +25,89 @@ static PyObject * BinaryPredicate1D___call__( BPy_BinaryPredicate1D *self, PyObj
 
 /*----------------------BinaryPredicate1D instance definitions ----------------------------*/
 static PyMethodDef BPy_BinaryPredicate1D_methods[] = {
-       {"getName", ( PyCFunction ) BinaryPredicate1D_getName, METH_NOARGS, "( )Returns the string of the name of the binary predicate."},
+       {"getName", ( PyCFunction ) BinaryPredicate1D_getName, METH_NOARGS, "() Returns the string of the name of the binary predicate."},
        {NULL, NULL, 0, NULL}
 };
 
 /*-----------------------BPy_BinaryPredicate1D type definition ------------------------------*/
 PyTypeObject BinaryPredicate1D_Type = {
-       PyObject_HEAD_INIT( NULL ) 
-       0,                                                                      /* ob_size */
-       "BinaryPredicate1D",                            /* tp_name */
-       sizeof( BPy_BinaryPredicate1D ),        /* tp_basicsize */
-       0,                                                                      /* tp_itemsize */
-       
-       /* methods */
-       (destructor)BinaryPredicate1D___dealloc__,              /* tp_dealloc */
-       NULL,                                                           /* printfunc tp_print; */
-       NULL,                                                           /* getattrfunc tp_getattr; */
-       NULL,                                                           /* setattrfunc tp_setattr; */
-       NULL,                                                                                   /* tp_compare */
-       (reprfunc)BinaryPredicate1D___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)BinaryPredicate1D___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_BinaryPredicate1D_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)BinaryPredicate1D___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)
+       "BinaryPredicate1D",            /* tp_name */
+       sizeof(BPy_BinaryPredicate1D),  /* tp_basicsize */
+       0,                              /* tp_itemsize */
+       (destructor)BinaryPredicate1D___dealloc__, /* tp_dealloc */
+       0,                              /* tp_print */
+       0,                              /* tp_getattr */
+       0,                              /* tp_setattr */
+       0,                              /* tp_reserved */
+       (reprfunc)BinaryPredicate1D___repr__, /* tp_repr */
+       0,                              /* tp_as_number */
+       0,                              /* tp_as_sequence */
+       0,                              /* tp_as_mapping */
+       0,                              /* tp_hash  */
+       (ternaryfunc)BinaryPredicate1D___call__, /* tp_call */
+       0,                              /* tp_str */
+       0,                              /* tp_getattro */
+       0,                              /* tp_setattro */
+       0,                              /* tp_as_buffer */
+       Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
+       "BinaryPredicate1D objects",    /* tp_doc */
+       0,                              /* tp_traverse */
+       0,                              /* tp_clear */
+       0,                              /* tp_richcompare */
+       0,                              /* tp_weaklistoffset */
+       0,                              /* tp_iter */
+       0,                              /* tp_iternext */
+       BPy_BinaryPredicate1D_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)BinaryPredicate1D___init__, /* tp_init */
+       0,                              /* tp_alloc */
+       PyType_GenericNew,              /* tp_new */
 };
 
 //-------------------MODULE INITIALIZATION--------------------------------
-PyMODINIT_FUNC BinaryPredicate1D_Init( PyObject *module )
+int BinaryPredicate1D_Init( PyObject *module )
 {
        if( module == NULL )
-               return;
+               return -1;
 
        if( PyType_Ready( &BinaryPredicate1D_Type ) < 0 )
-               return;
+               return -1;
        Py_INCREF( &BinaryPredicate1D_Type );
        PyModule_AddObject(module, "BinaryPredicate1D", (PyObject *)&BinaryPredicate1D_Type);
        
        if( PyType_Ready( &FalseBP1D_Type ) < 0 )
-               return;
+               return -1;
        Py_INCREF( &FalseBP1D_Type );
        PyModule_AddObject(module, "FalseBP1D", (PyObject *)&FalseBP1D_Type);
        
        if( PyType_Ready( &Length2DBP1D_Type ) < 0 )
-               return;
+               return -1;
        Py_INCREF( &Length2DBP1D_Type );
        PyModule_AddObject(module, "Length2DBP1D", (PyObject *)&Length2DBP1D_Type);
        
        if( PyType_Ready( &SameShapeIdBP1D_Type ) < 0 )
-               return;
+               return -1;
        Py_INCREF( &SameShapeIdBP1D_Type );
        PyModule_AddObject(module, "SameShapeIdBP1D", (PyObject *)&SameShapeIdBP1D_Type);
        
        if( PyType_Ready( &TrueBP1D_Type ) < 0 )
-               return;
+               return -1;
        Py_INCREF( &TrueBP1D_Type );
        PyModule_AddObject(module, "TrueBP1D", (PyObject *)&TrueBP1D_Type);
        
        if( PyType_Ready( &ViewMapGradientNormBP1D_Type ) < 0 )
-               return;
+               return -1;
        Py_INCREF( &ViewMapGradientNormBP1D_Type );
        PyModule_AddObject(module, "ViewMapGradientNormBP1D", (PyObject *)&ViewMapGradientNormBP1D_Type);
        
-       
+       return 0;
 }
 
 
@@ -168,17 +126,17 @@ void BinaryPredicate1D___dealloc__(BPy_BinaryPredicate1D* self)
 {
        if (self->bp1D)
                delete self->bp1D;
-    self->ob_type->tp_free((PyObject*)self);
+    Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
 PyObject * BinaryPredicate1D___repr__(BPy_BinaryPredicate1D* self)
 {
-    return PyString_FromFormat("type: %s - address: %p", self->bp1D->getName().c_str(), self->bp1D );
+    return PyUnicode_FromFormat("type: %s - address: %p", self->bp1D->getName().c_str(), self->bp1D );
 }
 
 PyObject *BinaryPredicate1D_getName( BPy_BinaryPredicate1D *self, PyObject *args)
 {
-       return PyString_FromString( self->bp1D->getName().c_str() );
+       return PyUnicode_FromFormat( self->bp1D->getName().c_str() );
 }
 
 PyObject *BinaryPredicate1D___call__( BPy_BinaryPredicate1D *self, PyObject *args, PyObject *kwds)