[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19290] branches/blender2.5/blender/source /blender/python: return operators as a PyCFunction rather then having our own callable operator type

Campbell Barton ideasman42 at gmail.com
Sat Mar 14 14:43:32 CET 2009


Revision: 19290
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19290
Author:   campbellbarton
Date:     2009-03-14 14:43:30 +0100 (Sat, 14 Mar 2009)

Log Message:
-----------
return operators as a PyCFunction rather then having our own callable operator type

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/python/epy_doc_gen.py
    branches/blender2.5/blender/source/blender/python/intern/bpy_operator.c
    branches/blender2.5/blender/source/blender/python/intern/bpy_operator.h
    branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c

Modified: branches/blender2.5/blender/source/blender/python/epy_doc_gen.py
===================================================================
--- branches/blender2.5/blender/source/blender/python/epy_doc_gen.py	2009-03-14 13:27:41 UTC (rev 19289)
+++ branches/blender2.5/blender/source/blender/python/epy_doc_gen.py	2009-03-14 13:43:30 UTC (rev 19290)
@@ -190,7 +190,6 @@
 	operators.remove('remove')
 	operators.sort()
 	
-	
 	for op in operators:
 		
 		if op.startswith('__'):
@@ -200,7 +199,7 @@
 		kw_args = [] # "foo = 1", "bar=0.5", "spam='ENUM'"
 		kw_arg_attrs = [] # "@type mode: int"
 		
-		rna = getattr(bpy.ops, op).rna
+		rna = getattr(bpy.types, op).__rna__
 		rna_struct = rna.rna_type
 		# print (dir(rna))
 		# print (dir(rna_struct))

Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_operator.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_operator.c	2009-03-14 13:27:41 UTC (rev 19289)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_operator.c	2009-03-14 13:43:30 UTC (rev 19290)
@@ -107,108 +107,25 @@
 	return error_val;
 }
 
-
-
-
-static int pyop_func_compare( BPy_OperatorFunc * a, BPy_OperatorFunc * b )
-{
-	return (strcmp(a->name, b->name)==0) ? 0 : -1;
-}
-
-/* For some reason python3 needs these :/ */
-static PyObject *pyop_func_richcmp(BPy_OperatorFunc * a, BPy_OperatorFunc * b, int op)
-{
-	int cmp_result= -1; /* assume false */
-	if (BPy_OperatorFunc_Check(a) && BPy_OperatorFunc_Check(b)) {
-		cmp_result= pyop_func_compare(a, b);
-	}
-
-	return Py_CmpToRich(op, cmp_result);
-}
-
-
-/*----------------------repr--------------------------------------------*/
-static PyObject *pyop_base_repr( BPy_OperatorBase * self )
-{
-	return PyUnicode_FromFormat( "[BPy_OperatorBase]");
-}
-
-static PyObject *pyop_func_repr( BPy_OperatorFunc * self )
-{
-	return PyUnicode_FromFormat( "[BPy_OperatorFunc \"%s\"]", self->name);
-}
-
+static PyObject *pyop_base_dir(PyObject *self);
 static struct PyMethodDef pyop_base_methods[] = {
+	{"__dir__", (PyCFunction)pyop_base_dir, METH_NOARGS, ""},
 	{"add", (PyCFunction)PYOP_wrap_add, METH_VARARGS, ""},
 	{"remove", (PyCFunction)PYOP_wrap_remove, METH_VARARGS, ""},
 	{NULL, NULL, 0, NULL}
 };
 
-//---------------getattr--------------------------------------------
-static PyObject *pyop_base_getattro( BPy_OperatorBase * self, PyObject *pyname )
+/* 'self' stores the operator string */
+static PyObject *pyop_base_call( PyObject * self, PyObject * args,  PyObject * kw)
 {
-	char *name = _PyUnicode_AsString(pyname);
-	PyObject *ret;
 	wmOperatorType *ot;
-	PyMethodDef *meth;
-	
-	if ((ot = WM_operatortype_find(name))) {
-		ret= pyop_func_CreatePyObject(self->C, name);
-	}
-	else if (strcmp(name, "__dict__")==0) {
-		ret = PyDict_New();
-
-		for(ot= WM_operatortype_first(); ot; ot= ot->next) {
-			PyDict_SetItemString(ret, ot->idname, Py_None);
-		}
-
-		for(meth=pyop_base_methods; meth->ml_name; meth++) {
-			PyDict_SetItemString(ret, meth->ml_name, Py_None);
-		}
-	}
-	else if ((ret = PyObject_GenericGetAttr((PyObject *)self, pyname))) {
-		/* do nothing, this accounts for methoddef's add and remove */
-	}
-	else {
-		PyErr_Format( PyExc_AttributeError, "Operator \"%s\" not found", name);
-		ret= NULL;
-	}
-
-	return ret;
-}
-
-/* getseter's */
-PyObject *pyop_func_get_rna(BPy_OperatorFunc *self)
-{
-	BPy_StructRNA *pyrna;
-	PointerRNA ptr;
-	wmOperatorType *ot;
-
-	ot= WM_operatortype_find(self->name);
-	if (ot == NULL) {
-		PyErr_SetString( PyExc_SystemError, "Operator could not be found");
-		return NULL;
-	}
-
-	/* XXX POINTER - if this 'ot' is python generated, it could be free'd */
-	RNA_pointer_create(NULL, ot->srna, NULL, &ptr);
-	pyrna= (BPy_StructRNA *)pyrna_struct_CreatePyObject(&ptr); /* were not really using &ptr, overwite next */
-	pyrna->freeptr= 1;
-
-	return (PyObject *)pyrna;
-}
-
-static PyGetSetDef pyop_func_getseters[] = {
-	{"rna", (getter)pyop_func_get_rna, (setter)NULL, "Operator RNA properties", NULL},
-	{NULL,NULL,NULL,NULL,NULL}  /* Sentinel */
-};
-
-static PyObject * pyop_func_call(BPy_OperatorFunc * self, PyObject *args, PyObject *kw)
-{
-	wmOperatorType *ot;
-
 	int error_val = 0;
 	PointerRNA ptr;
+	
+	// XXX Todo, work out a better solution for passing on context, could make a tuple from self and pack the name and Context into it...
+	bContext *C = (bContext *)PyCObject_AsVoidPtr(PyDict_GetItemString(PyEval_GetGlobals(), "__bpy_context__"));
+	
+	char *opname = _PyUnicode_AsString(self);
 	char *report_str= NULL;
 
 	if (PyTuple_Size(args)) {
@@ -216,18 +133,18 @@
 		return NULL;
 	}
 
-	ot= WM_operatortype_find(self->name);
+	ot= WM_operatortype_find(opname);
 	if (ot == NULL) {
-		PyErr_SetString( PyExc_SystemError, "Operator could not be found");
+		PyErr_Format( PyExc_SystemError, "Operator \"%s\"could not be found", opname);
 		return NULL;
 	}
 	
-	if(ot->poll && (ot->poll(self->C) == 0)) {
+	if(ot->poll && (ot->poll(C) == 0)) {
 		PyErr_SetString( PyExc_SystemError, "Operator poll() function failed, context is incorrect");
 		return NULL;
 	}
 	
-	WM_operator_properties_create(&ptr, self->name);
+	WM_operator_properties_create(&ptr, opname);
 	
 	error_val= PYOP_props_from_dict(&ptr, kw);
 	
@@ -236,7 +153,7 @@
 
 		BKE_reports_init(&reports, RPT_STORE);
 
-		WM_operator_call_py(self->C, ot, &ptr, &reports);
+		WM_operator_call_py(C, ot, &ptr, &reports);
 
 		report_str= BKE_reports_string(&reports, RPT_ERROR);
 
@@ -257,11 +174,11 @@
 	{
 		/* no props */
 		if (kw != NULL) {
-			PyErr_Format(PyExc_AttributeError, "Operator \"%s\" does not take any args", self->name);
+			PyErr_Format(PyExc_AttributeError, "Operator \"%s\" does not take any args", opname);
 			return NULL;
 		}
 
-		WM_operator_name_call(self->C, self->name, WM_OP_EXEC_DEFAULT, NULL);
+		WM_operator_name_call(C, opname, WM_OP_EXEC_DEFAULT, NULL);
 	}
 #endif
 
@@ -272,221 +189,67 @@
 	Py_RETURN_NONE;
 }
 
-/*-----------------------BPy_OperatorBase method def------------------------------*/
-PyTypeObject pyop_base_Type = {
-#if (PY_VERSION_HEX >= 0x02060000)
-	PyVarObject_HEAD_INIT(NULL, 0)
-#else
-	/* python 2.5 and below */
-	PyObject_HEAD_INIT( NULL )  /* required py macro */
-	0,                          /* ob_size */
-#endif
-
-	"Operator",		/* tp_name */
-	sizeof( BPy_OperatorBase ),			/* tp_basicsize */
-	0,			/* tp_itemsize */
-	/* methods */
-	NULL,						/* tp_dealloc */
-	NULL,                       /* printfunc tp_print; */
-	NULL,						/* getattrfunc tp_getattr; */
-	NULL,                       /* setattrfunc tp_setattr; */
-	NULL,						/* tp_compare */
-	( reprfunc ) pyop_base_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; */
-	NULL,                       /* ternaryfunc tp_call; */
-	NULL,                       /* reprfunc tp_str; */
-	( getattrofunc )pyop_base_getattro, /*PyObject_GenericGetAttr - MINGW Complains, assign later */	/* getattrofunc tp_getattro; */
-	NULL, /*PyObject_GenericSetAttr - MINGW Complains, assign later */	/* 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,         /* 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 ***/
-	pyop_base_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; */
-	NULL,                       /* initproc tp_init; */
-	NULL,                       /* allocfunc tp_alloc; */
-	NULL,						/* 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
+static PyMethodDef pyop_base_call_meth[] = {
+	{"__op_call__", pyop_base_call, METH_VARARGS|METH_KEYWORDS, "generic operator calling function"}
 };
 
-/*-----------------------BPy_OperatorBase method def------------------------------*/
-PyTypeObject pyop_func_Type = {
-#if (PY_VERSION_HEX >= 0x02060000)
-	PyVarObject_HEAD_INIT(NULL, 0)
-#else
-	/* python 2.5 and below */
-	PyObject_HEAD_INIT( NULL )  /* required py macro */
-	0,                          /* ob_size */
-#endif
 
-	"OperatorFunc",		/* tp_name */
-	sizeof( BPy_OperatorFunc ),			/* tp_basicsize */
-	0,			/* tp_itemsize */
-	/* methods */
-	NULL,						/* tp_dealloc */
-	NULL,                       /* printfunc tp_print; */
-	NULL,						/* getattrfunc tp_getattr; */
-	NULL,                       /* setattrfunc tp_setattr; */
-	NULL,						/* tp_compare */ /* DEPRECATED in python 3.0! */
-	( reprfunc ) pyop_func_repr,	/* tp_repr */
-
-	/* Method suites for standard classes */
-
-	NULL,                       /* PyNumberMethods *tp_as_number; */

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list