[Python-checkins]
python/dist/src/Mac/Modules/osa _OSAmodule.c, 1.2,
1.3 osasupport.py, 1.3, 1.4
jackjansen at users.sourceforge.net
jackjansen at users.sourceforge.net
Wed Dec 10 10:18:20 EST 2003
Update of /cvsroot/python/python/dist/src/Mac/Modules/osa
In directory sc8-pr-cvs1:/tmp/cvs-serv29540
Modified Files:
_OSAmodule.c osasupport.py
Log Message:
- Renamed OSA.ComponentInstance to OSA.OSAComponentInstance. It is not
a real subtype of Cm.ComponentInstance right now, it turns out that is
too difficult.
- OSA.OSAComponentInstance initializer does accept a Cm.ComponentInstance
instance, though, so at least things are becoming useable.
Index: _OSAmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/osa/_OSAmodule.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** _OSAmodule.c 9 Dec 2003 15:06:17 -0000 1.2
--- _OSAmodule.c 10 Dec 2003 15:18:18 -0000 1.3
***************
*** 31,53 ****
static PyObject *OSA_Error;
! /* ----------------- Object type ComponentInstance ------------------ */
! PyTypeObject ComponentInstance_Type;
! #define OSAObj_Check(x) ((x)->ob_type == &ComponentInstance_Type || PyObject_TypeCheck((x), &ComponentInstance_Type))
! typedef struct ComponentInstanceObject {
PyObject_HEAD
ComponentInstance ob_itself;
! } ComponentInstanceObject;
PyObject *OSAObj_New(ComponentInstance itself)
{
! ComponentInstanceObject *it;
if (itself == NULL) {
PyErr_SetString(OSA_Error,"NULL ComponentInstance");
return NULL;
}
! it = PyObject_NEW(ComponentInstanceObject, &ComponentInstance_Type);
if (it == NULL) return NULL;
it->ob_itself = itself;
--- 31,53 ----
static PyObject *OSA_Error;
! /* ---------------- Object type OSAComponentInstance ---------------- */
! PyTypeObject OSAComponentInstance_Type;
! #define OSAObj_Check(x) ((x)->ob_type == &OSAComponentInstance_Type || PyObject_TypeCheck((x), &OSAComponentInstance_Type))
! typedef struct OSAComponentInstanceObject {
PyObject_HEAD
ComponentInstance ob_itself;
! } OSAComponentInstanceObject;
PyObject *OSAObj_New(ComponentInstance itself)
{
! OSAComponentInstanceObject *it;
if (itself == NULL) {
PyErr_SetString(OSA_Error,"NULL ComponentInstance");
return NULL;
}
! it = PyObject_NEW(OSAComponentInstanceObject, &OSAComponentInstance_Type);
if (it == NULL) return NULL;
it->ob_itself = itself;
***************
*** 56,69 ****
int OSAObj_Convert(PyObject *v, ComponentInstance *p_itself)
{
if (!OSAObj_Check(v))
{
! PyErr_SetString(PyExc_TypeError, "ComponentInstance required");
return 0;
}
! *p_itself = ((ComponentInstanceObject *)v)->ob_itself;
return 1;
}
! static void OSAObj_dealloc(ComponentInstanceObject *self)
{
/* Cleanup of self->ob_itself goes here */
--- 56,74 ----
int OSAObj_Convert(PyObject *v, ComponentInstance *p_itself)
{
+
+ if (CmpInstObj_Convert(v, p_itself))
+ return 1;
+ PyErr_Clear();
+
if (!OSAObj_Check(v))
{
! PyErr_SetString(PyExc_TypeError, "OSAComponentInstance required");
return 0;
}
! *p_itself = ((OSAComponentInstanceObject *)v)->ob_itself;
return 1;
}
! static void OSAObj_dealloc(OSAComponentInstanceObject *self)
{
/* Cleanup of self->ob_itself goes here */
***************
*** 71,75 ****
}
! static PyObject *OSAObj_OSALoad(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 76,80 ----
}
! static PyObject *OSAObj_OSALoad(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 95,99 ****
}
! static PyObject *OSAObj_OSAStore(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 100,104 ----
}
! static PyObject *OSAObj_OSAStore(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 122,126 ****
}
! static PyObject *OSAObj_OSAExecute(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 127,131 ----
}
! static PyObject *OSAObj_OSAExecute(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 149,153 ****
}
! static PyObject *OSAObj_OSADisplay(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 154,158 ----
}
! static PyObject *OSAObj_OSADisplay(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 176,180 ****
}
! static PyObject *OSAObj_OSAScriptError(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 181,185 ----
}
! static PyObject *OSAObj_OSAScriptError(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 200,204 ****
}
! static PyObject *OSAObj_OSADispose(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 205,209 ----
}
! static PyObject *OSAObj_OSADispose(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 219,223 ****
}
! static PyObject *OSAObj_OSASetScriptInfo(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 224,228 ----
}
! static PyObject *OSAObj_OSASetScriptInfo(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 244,248 ****
}
! static PyObject *OSAObj_OSAGetScriptInfo(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 249,253 ----
}
! static PyObject *OSAObj_OSAGetScriptInfo(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 268,272 ****
}
! static PyObject *OSAObj_OSAScriptingComponentName(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 273,277 ----
}
! static PyObject *OSAObj_OSAScriptingComponentName(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 286,290 ****
}
! static PyObject *OSAObj_OSACompile(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 291,295 ----
}
! static PyObject *OSAObj_OSACompile(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 310,314 ****
}
! static PyObject *OSAObj_OSACopyID(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 315,319 ----
}
! static PyObject *OSAObj_OSACopyID(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 331,335 ****
}
! static PyObject *OSAObj_OSAGetSource(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 336,340 ----
}
! static PyObject *OSAObj_OSAGetSource(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 355,359 ****
}
! static PyObject *OSAObj_OSACoerceFromDesc(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 360,364 ----
}
! static PyObject *OSAObj_OSACoerceFromDesc(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 379,383 ****
}
! static PyObject *OSAObj_OSACoerceToDesc(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 384,388 ----
}
! static PyObject *OSAObj_OSACoerceToDesc(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 406,410 ****
}
! static PyObject *OSAObj_OSASetDefaultTarget(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 411,415 ----
}
! static PyObject *OSAObj_OSASetDefaultTarget(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 425,429 ****
}
! static PyObject *OSAObj_OSAStartRecording(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 430,434 ----
}
! static PyObject *OSAObj_OSAStartRecording(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 443,447 ****
}
! static PyObject *OSAObj_OSAStopRecording(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 448,452 ----
}
! static PyObject *OSAObj_OSAStopRecording(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 462,466 ****
}
! static PyObject *OSAObj_OSALoadExecute(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 467,471 ----
}
! static PyObject *OSAObj_OSALoadExecute(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 489,493 ****
}
! static PyObject *OSAObj_OSACompileExecute(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 494,498 ----
}
! static PyObject *OSAObj_OSACompileExecute(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 516,520 ****
}
! static PyObject *OSAObj_OSADoScript(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 521,525 ----
}
! static PyObject *OSAObj_OSADoScript(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 546,550 ****
}
! static PyObject *OSAObj_OSASetCurrentDialect(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 551,555 ----
}
! static PyObject *OSAObj_OSASetCurrentDialect(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 565,569 ****
}
! static PyObject *OSAObj_OSAGetCurrentDialect(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 570,574 ----
}
! static PyObject *OSAObj_OSAGetCurrentDialect(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 583,587 ****
}
! static PyObject *OSAObj_OSAAvailableDialects(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 588,592 ----
}
! static PyObject *OSAObj_OSAAvailableDialects(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 601,605 ****
}
! static PyObject *OSAObj_OSAGetDialectInfo(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 606,610 ----
}
! static PyObject *OSAObj_OSAGetDialectInfo(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 625,629 ****
}
! static PyObject *OSAObj_OSAAvailableDialectCodeList(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 630,634 ----
}
! static PyObject *OSAObj_OSAAvailableDialectCodeList(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 643,647 ****
}
! static PyObject *OSAObj_OSAExecuteEvent(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 648,652 ----
}
! static PyObject *OSAObj_OSAExecuteEvent(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 670,674 ****
}
! static PyObject *OSAObj_OSADoEvent(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 675,679 ----
}
! static PyObject *OSAObj_OSADoEvent(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 697,701 ****
}
! static PyObject *OSAObj_OSAMakeContext(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 702,706 ----
}
! static PyObject *OSAObj_OSAMakeContext(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 721,725 ****
}
! static PyObject *OSAObj_OSADebuggerCreateSession(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 726,730 ----
}
! static PyObject *OSAObj_OSADebuggerCreateSession(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 745,749 ****
}
! static PyObject *OSAObj_OSADebuggerGetSessionState(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 750,754 ----
}
! static PyObject *OSAObj_OSADebuggerGetSessionState(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 766,770 ****
}
! static PyObject *OSAObj_OSADebuggerSessionStep(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 771,775 ----
}
! static PyObject *OSAObj_OSADebuggerSessionStep(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 788,792 ****
}
! static PyObject *OSAObj_OSADebuggerDisposeSession(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 793,797 ----
}
! static PyObject *OSAObj_OSADebuggerDisposeSession(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 807,811 ****
}
! static PyObject *OSAObj_OSADebuggerGetStatementRanges(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 812,816 ----
}
! static PyObject *OSAObj_OSADebuggerGetStatementRanges(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 828,832 ****
}
! static PyObject *OSAObj_OSADebuggerGetBreakpoint(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 833,837 ----
}
! static PyObject *OSAObj_OSADebuggerGetBreakpoint(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 852,856 ****
}
! static PyObject *OSAObj_OSADebuggerSetBreakpoint(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 857,861 ----
}
! static PyObject *OSAObj_OSADebuggerSetBreakpoint(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 877,881 ****
}
! static PyObject *OSAObj_OSADebuggerGetDefaultBreakpoint(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 882,886 ----
}
! static PyObject *OSAObj_OSADebuggerGetDefaultBreakpoint(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 898,902 ****
}
! static PyObject *OSAObj_OSADebuggerGetCurrentCallFrame(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 903,907 ----
}
! static PyObject *OSAObj_OSADebuggerGetCurrentCallFrame(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 919,923 ****
}
! static PyObject *OSAObj_OSADebuggerGetCallFrameState(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 924,928 ----
}
! static PyObject *OSAObj_OSADebuggerGetCallFrameState(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 940,944 ****
}
! static PyObject *OSAObj_OSADebuggerGetVariable(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 945,949 ----
}
! static PyObject *OSAObj_OSADebuggerGetVariable(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 964,968 ****
}
! static PyObject *OSAObj_OSADebuggerSetVariable(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 969,973 ----
}
! static PyObject *OSAObj_OSADebuggerSetVariable(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 989,993 ****
}
! static PyObject *OSAObj_OSADebuggerGetPreviousCallFrame(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 994,998 ----
}
! static PyObject *OSAObj_OSADebuggerGetPreviousCallFrame(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1010,1014 ****
}
! static PyObject *OSAObj_OSADebuggerDisposeCallFrame(ComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
--- 1015,1019 ----
}
! static PyObject *OSAObj_OSADebuggerDisposeCallFrame(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1137,1141 ****
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, OSAObj_Convert, &itself)) return NULL;
if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
! ((ComponentInstanceObject *)self)->ob_itself = itself;
return self;
}
--- 1142,1146 ----
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, OSAObj_Convert, &itself)) return NULL;
if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
! ((OSAComponentInstanceObject *)self)->ob_itself = itself;
return self;
}
***************
*** 1144,1152 ****
! PyTypeObject ComponentInstance_Type = {
PyObject_HEAD_INIT(NULL)
0, /*ob_size*/
! "_OSA.ComponentInstance", /*tp_name*/
! sizeof(ComponentInstanceObject), /*tp_basicsize*/
0, /*tp_itemsize*/
/* methods */
--- 1149,1157 ----
! PyTypeObject OSAComponentInstance_Type = {
PyObject_HEAD_INIT(NULL)
0, /*ob_size*/
! "_OSA.OSAComponentInstance", /*tp_name*/
! sizeof(OSAComponentInstanceObject), /*tp_basicsize*/
0, /*tp_itemsize*/
/* methods */
***************
*** 1188,1192 ****
};
! /* --------------- End object type ComponentInstance ---------------- */
--- 1193,1197 ----
};
! /* -------------- End object type OSAComponentInstance -------------- */
***************
*** 1217,1227 ****
PyDict_SetItemString(d, "Error", OSA_Error) != 0)
return;
! ComponentInstance_Type.ob_type = &PyType_Type;
! if (PyType_Ready(&ComponentInstance_Type) < 0) return;
! Py_INCREF(&ComponentInstance_Type);
! PyModule_AddObject(m, "ComponentInstance", (PyObject *)&ComponentInstance_Type);
/* Backward-compatible name */
! Py_INCREF(&ComponentInstance_Type);
! PyModule_AddObject(m, "ComponentInstanceType", (PyObject *)&ComponentInstance_Type);
}
--- 1222,1232 ----
PyDict_SetItemString(d, "Error", OSA_Error) != 0)
return;
! OSAComponentInstance_Type.ob_type = &PyType_Type;
! if (PyType_Ready(&OSAComponentInstance_Type) < 0) return;
! Py_INCREF(&OSAComponentInstance_Type);
! PyModule_AddObject(m, "OSAComponentInstance", (PyObject *)&OSAComponentInstance_Type);
/* Backward-compatible name */
! Py_INCREF(&OSAComponentInstance_Type);
! PyModule_AddObject(m, "OSAComponentInstanceType", (PyObject *)&OSAComponentInstance_Type);
}
Index: osasupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/osa/osasupport.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** osasupport.py 9 Dec 2003 15:06:18 -0000 1.3
--- osasupport.py 10 Dec 2003 15:18:18 -0000 1.4
***************
*** 69,76 ****
return NULL;
}""")
# Create the generator groups and link them
module = MacModule(MODNAME, MODPREFIX, includestuff, finalstuff, initstuff)
! object = MyObjectDefinition('ComponentInstance', OBJECTPREFIX,
'ComponentInstance')
module.addobject(object)
--- 69,84 ----
return NULL;
}""")
+
+ def outputCheckConvertArg(self):
+ Output("""
+ if (CmpInstObj_Convert(v, p_itself))
+ return 1;
+ PyErr_Clear();
+ """)
+
# Create the generator groups and link them
module = MacModule(MODNAME, MODPREFIX, includestuff, finalstuff, initstuff)
! object = MyObjectDefinition('OSAComponentInstance', OBJECTPREFIX,
'ComponentInstance')
module.addobject(object)
More information about the Python-checkins
mailing list