Update of /cvsroot/mahogany/M/src/Python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5484/src/Python
Modified Files:
PythonDll.cpp
Log Message:
added symbols used in the code generated by swig 1.3.28 (might be not present
in python < 2.4, to be tested...)
Index: PythonDll.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/Python/PythonDll.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -b -u -2 -r1.24 -r1.25
--- PythonDll.cpp 16 Jan 2006 03:39:57 -0000 1.24
+++ PythonDll.cpp 30 Mar 2006 02:22:19 -0000 1.25
@@ -87,10 +87,14 @@
// objects
M_PY_WRAPPER_DEF(PyObject_Init);
+ M_PY_WRAPPER_DEF(PyObject_Call);
M_PY_WRAPPER_DEF(PyObject_CallFunction);
+ M_PY_WRAPPER_DEF(PyObject_CallFunctionObjArgs);
M_PY_WRAPPER_DEF(PyObject_CallObject);
+ M_PY_WRAPPER_DEF(PyObject_Free);
+ M_PY_WRAPPER_DEF(PyObject_GenericGetAttr);
M_PY_WRAPPER_DEF(PyObject_GetAttr);
M_PY_WRAPPER_DEF(PyObject_GetAttrString);
+ M_PY_WRAPPER_DEF(PyObject_IsTrue);
M_PY_WRAPPER_DEF(PyObject_Malloc);
- M_PY_WRAPPER_DEF(PyObject_Free);
M_PY_WRAPPER_DEF(PyObject_SetAttrString);
M_PY_WRAPPER_DEF(PyObject_Size);
@@ -98,4 +102,10 @@
M_PY_WRAPPER_DEF(PyCObject_Import);
M_PY_WRAPPER_DEF(PyCObject_FromVoidPtr);
+ M_PY_WRAPPER_DEF(_PyObject_GetDictPtr);
+
+ // instances
+ M_PY_WRAPPER_DEF(PyInstance_NewRaw);
+ M_PY_WRAPPER_DEF(_PyInstance_Lookup);
+ M_PY_VAR_DEF(PyInstance_Type);
// ints and longs
@@ -114,4 +124,5 @@
M_PY_WRAPPER_DEF(PyString_AsString);
M_PY_WRAPPER_DEF(PyString_AsStringAndSize);
+ M_PY_WRAPPER_DEF(PyString_ConcatAndDel);
M_PY_WRAPPER_DEF(PyString_Format);
M_PY_WRAPPER_DEF(PyString_FromString);
@@ -126,11 +137,21 @@
M_PY_WRAPPER_DEF(PyTuple_GetItem);
M_PY_WRAPPER_DEF(PyTuple_SetItem);
+ M_PY_VAR_DEF(PyTuple_Type);
+
+ // dicts
+ M_PY_WRAPPER_DEF(PyDict_GetItem);
+ M_PY_WRAPPER_DEF(PyDict_GetItemString);
+ M_PY_WRAPPER_DEF(PyDict_New);
+ M_PY_WRAPPER_DEF(PyDict_SetItem);
+ M_PY_WRAPPER_DEF(PyDict_SetItemString);
+
+ // args
+ M_PY_WRAPPER_DEF(PyArg_Parse);
+ M_PY_WRAPPER_DEF(PyArg_ParseTuple);
+ M_PY_WRAPPER_DEF(PyArg_UnpackTuple);
// ...
M_PY_WRAPPER_DEF(Py_VaBuildValue);
M_PY_WRAPPER_DEF(_Py_Dealloc);
- M_PY_WRAPPER_DEF(PyArg_Parse);
- M_PY_WRAPPER_DEF(PyArg_ParseTuple);
- M_PY_WRAPPER_DEF(PyDict_SetItemString);
M_PY_WRAPPER_DEF(PyEval_RestoreThread);
M_PY_WRAPPER_DEF(PyEval_SaveThread);
@@ -141,5 +162,4 @@
M_PY_VAR_DEF(PyList_Type);
M_PY_WRAPPER_DEF(PyImport_ImportModule);
- M_PY_WRAPPER_DEF(PyDict_GetItemString);
M_PY_WRAPPER_DEF(PyModule_GetDict);
M_PY_WRAPPER_DEF(PyModule_AddObject);
@@ -162,15 +182,31 @@
M_PY_WRAPPER_DEF(PyOS_snprintf);
+ // misc types
+ M_PY_VAR_DEF(PyBaseObject_Type);
+ M_PY_VAR_DEF(PyClass_Type);
+ M_PY_VAR_DEF(PyCFunction_Type);
+ M_PY_VAR_DEF(PyModule_Type);
+ M_PY_VAR_DEF(_PyWeakref_CallableProxyType);
+ M_PY_VAR_DEF(_PyWeakref_ProxyType);
+
// variables
M_PY_VAR_DEF(_Py_RefTotal);
- M_PY_VAR_DEF(PyModule_Type);
M_PY_VAR_DEF(_Py_NoneStruct);
M_PY_VAR_DEF(_Py_NotImplementedStruct);
- M_PY_VAR_DEF(PyCFunction_Type);
// exception objects
+ M_PY_VAR_DEF(PyExc_AttributeError);
+ M_PY_VAR_DEF(PyExc_IOError);
+ M_PY_VAR_DEF(PyExc_IndexError);
+ M_PY_VAR_DEF(PyExc_MemoryError);
M_PY_VAR_DEF(PyExc_NameError);
M_PY_VAR_DEF(PyExc_NotImplementedError);
+ M_PY_VAR_DEF(PyExc_OverflowError);
+ M_PY_VAR_DEF(PyExc_RuntimeError);
+ M_PY_VAR_DEF(PyExc_SyntaxError);
+ M_PY_VAR_DEF(PyExc_SystemError);
M_PY_VAR_DEF(PyExc_TypeError);
+ M_PY_VAR_DEF(PyExc_ValueError);
+ M_PY_VAR_DEF(PyExc_ZeroDivisionError);
}
@@ -188,5 +224,5 @@
#endif
-#define PYTHON_FUNC(func) { _T(#func), NULL, (PYTHON_PROC *)&M_ ## func },
+#define PYTHON_SYMBOL(func) { _T(#func), NULL, (PYTHON_PROC *)&M_ ## func },
#define PYTHON_FUNC_ALT(func, alt) { _T(#func), _T(#alt), (PYTHON_PROC *)&M_
## func },
@@ -199,88 +235,126 @@
{
// startup/shutdown
- PYTHON_FUNC(Py_Initialize)
- PYTHON_FUNC(Py_Finalize)
+ PYTHON_SYMBOL(Py_Initialize)
+ PYTHON_SYMBOL(Py_Finalize)
// errors
- PYTHON_FUNC(PyErr_Clear)
- PYTHON_FUNC(PyErr_Fetch)
- PYTHON_FUNC(PyErr_Occurred)
- PYTHON_FUNC(PyErr_Restore)
- PYTHON_FUNC(PyErr_SetString)
- PYTHON_FUNC(PyErr_Format)
+ PYTHON_SYMBOL(PyErr_Clear)
+ PYTHON_SYMBOL(PyErr_Fetch)
+ PYTHON_SYMBOL(PyErr_Occurred)
+ PYTHON_SYMBOL(PyErr_Restore)
+ PYTHON_SYMBOL(PyErr_SetString)
+ PYTHON_SYMBOL(PyErr_Format)
// objects
- PYTHON_FUNC(PyObject_Init)
- PYTHON_FUNC(PyObject_CallFunction)
- PYTHON_FUNC(PyObject_CallObject)
- PYTHON_FUNC(PyObject_GetAttr)
- PYTHON_FUNC(PyObject_GetAttrString)
- PYTHON_FUNC(PyObject_Malloc)
- PYTHON_FUNC(PyObject_Free)
- PYTHON_FUNC(PyObject_SetAttrString)
- PYTHON_FUNC(PyObject_Size)
- PYTHON_FUNC(PyObject_Str)
- PYTHON_FUNC(PyCObject_Import)
- PYTHON_FUNC(PyCObject_FromVoidPtr)
+ PYTHON_SYMBOL(PyObject_Init)
+ PYTHON_SYMBOL(PyObject_Call)
+ PYTHON_SYMBOL(PyObject_CallFunction)
+ PYTHON_SYMBOL(PyObject_CallFunctionObjArgs)
+ PYTHON_SYMBOL(PyObject_CallObject)
+ PYTHON_SYMBOL(PyObject_Free)
+ PYTHON_SYMBOL(PyObject_GenericGetAttr)
+ PYTHON_SYMBOL(PyObject_GetAttr)
+ PYTHON_SYMBOL(PyObject_GetAttrString)
+ PYTHON_SYMBOL(PyObject_IsTrue)
+ PYTHON_SYMBOL(PyObject_Malloc)
+ PYTHON_SYMBOL(PyObject_SetAttrString)
+ PYTHON_SYMBOL(PyObject_Size)
+ PYTHON_SYMBOL(PyObject_Str)
+ PYTHON_SYMBOL(PyCObject_Import)
+ PYTHON_SYMBOL(PyCObject_FromVoidPtr)
+ PYTHON_SYMBOL(_PyObject_GetDictPtr)
+
+ // instances
+ PYTHON_SYMBOL(PyInstance_NewRaw)
+ PYTHON_SYMBOL(PyInstance_Type)
+ PYTHON_SYMBOL(_PyInstance_Lookup)
// ints and longs
- PYTHON_FUNC(PyInt_AsLong)
- PYTHON_FUNC(PyInt_FromLong)
- PYTHON_FUNC(PyLong_FromUnsignedLong)
- PYTHON_FUNC(PyLong_FromVoidPtr)
- PYTHON_FUNC(PyLong_AsLong)
- PYTHON_FUNC(PyLong_AsUnsignedLong)
- PYTHON_FUNC(PyInt_Type)
- PYTHON_FUNC(PyLong_Type)
- PYTHON_FUNC(_Py_TrueStruct)
- PYTHON_FUNC(_Py_ZeroStruct)
+ PYTHON_SYMBOL(PyInt_AsLong)
+ PYTHON_SYMBOL(PyInt_FromLong)
+ PYTHON_SYMBOL(PyLong_FromUnsignedLong)
+ PYTHON_SYMBOL(PyLong_FromVoidPtr)
+ PYTHON_SYMBOL(PyLong_AsLong)
+ PYTHON_SYMBOL(PyLong_AsUnsignedLong)
+ PYTHON_SYMBOL(PyInt_Type)
+ PYTHON_SYMBOL(PyLong_Type)
+ PYTHON_SYMBOL(_Py_TrueStruct)
+ PYTHON_SYMBOL(_Py_ZeroStruct)
// strings
- PYTHON_FUNC(PyString_AsString)
- PYTHON_FUNC(PyString_AsStringAndSize)
- PYTHON_FUNC(PyString_Format)
- PYTHON_FUNC(PyString_FromString)
- PYTHON_FUNC(PyString_FromStringAndSize)
- PYTHON_FUNC(PyString_FromFormat)
- PYTHON_FUNC(PyString_InternFromString)
- PYTHON_FUNC(PyString_Type)
+ PYTHON_SYMBOL(PyString_AsString)
+ PYTHON_SYMBOL(PyString_AsStringAndSize)
+ PYTHON_SYMBOL(PyString_ConcatAndDel)
+ PYTHON_SYMBOL(PyString_Format)
+ PYTHON_SYMBOL(PyString_FromString)
+ PYTHON_SYMBOL(PyString_FromStringAndSize)
+ PYTHON_SYMBOL(PyString_FromFormat)
+ PYTHON_SYMBOL(PyString_InternFromString)
+ PYTHON_SYMBOL(PyString_Type)
// tuples
- PYTHON_FUNC(PyTuple_New)
- PYTHON_FUNC(PyTuple_GetItem)
- PYTHON_FUNC(PyTuple_SetItem)
+ PYTHON_SYMBOL(PyTuple_New)
+ PYTHON_SYMBOL(PyTuple_GetItem)
+ PYTHON_SYMBOL(PyTuple_SetItem)
+ PYTHON_SYMBOL(PyTuple_Type)
+
+ // dicts
+ PYTHON_SYMBOL(PyDict_GetItem)
+ PYTHON_SYMBOL(PyDict_GetItemString)
+ PYTHON_SYMBOL(PyDict_New)
+ PYTHON_SYMBOL(PyDict_SetItem)
+ PYTHON_SYMBOL(PyDict_SetItemString)
+
+ // args
+ PYTHON_SYMBOL(PyArg_Parse)
+ PYTHON_SYMBOL(PyArg_ParseTuple)
+ PYTHON_SYMBOL(PyArg_UnpackTuple)
// ...
- PYTHON_FUNC(_Py_NoneStruct)
- PYTHON_FUNC(_Py_NotImplementedStruct)
- PYTHON_FUNC(PyCFunction_Type)
+ PYTHON_SYMBOL(_Py_NoneStruct)
+ PYTHON_SYMBOL(_Py_NotImplementedStruct)
+ PYTHON_SYMBOL(PyCFunction_Type)
PYTHON_FUNC_ALT(Py_InitModule4, Py_InitModule4TraceRefs)
- PYTHON_FUNC(Py_BuildValue)
- PYTHON_FUNC(Py_VaBuildValue)
+ PYTHON_SYMBOL(Py_BuildValue)
+ PYTHON_SYMBOL(Py_VaBuildValue)
#ifdef Py_REF_DEBUG
- PYTHON_FUNC(_Py_RefTotal)
+ PYTHON_SYMBOL(_Py_RefTotal)
#endif // Py_REF_DEBUG
- PYTHON_FUNC(PyModule_Type)
#ifdef Py_TRACE_REFS
- PYTHON_FUNC(_Py_Dealloc)
+ PYTHON_SYMBOL(_Py_Dealloc)
#endif // Py_TRACE_REFS
- PYTHON_FUNC(PyArg_Parse)
- PYTHON_FUNC(PyArg_ParseTuple)
- PYTHON_FUNC(PyDict_GetItemString)
- PYTHON_FUNC(PyDict_SetItemString)
- PYTHON_FUNC(PyImport_ImportModule)
- PYTHON_FUNC(PyModule_GetDict)
- PYTHON_FUNC(PyModule_AddObject)
- PYTHON_FUNC(PyEval_CallObjectWithKeywords)
- PYTHON_FUNC(PyExc_NameError)
- PYTHON_FUNC(PyExc_NotImplementedError)
- PYTHON_FUNC(PyExc_TypeError)
- PYTHON_FUNC(PyFloat_FromDouble)
- PYTHON_FUNC(PyImport_AddModule)
- PYTHON_FUNC(PyImport_GetModuleDict)
- PYTHON_FUNC(PyImport_ReloadModule)
- PYTHON_FUNC(PyRun_String)
- PYTHON_FUNC(PyType_IsSubtype)
+ // misc types
+ PYTHON_SYMBOL(PyBaseObject_Type)
+ PYTHON_SYMBOL(PyClass_Type)
+ PYTHON_SYMBOL(PyModule_Type)
+ PYTHON_SYMBOL(_PyWeakref_CallableProxyType)
+ PYTHON_SYMBOL(_PyWeakref_ProxyType)
+
+ PYTHON_SYMBOL(PyImport_ImportModule)
+ PYTHON_SYMBOL(PyModule_GetDict)
+ PYTHON_SYMBOL(PyModule_AddObject)
+ PYTHON_SYMBOL(PyEval_CallObjectWithKeywords)
+
+ PYTHON_SYMBOL(PyExc_AttributeError)
+ PYTHON_SYMBOL(PyExc_IOError)
+ PYTHON_SYMBOL(PyExc_IndexError)
+ PYTHON_SYMBOL(PyExc_MemoryError)
+ PYTHON_SYMBOL(PyExc_NameError)
+ PYTHON_SYMBOL(PyExc_NotImplementedError)
+ PYTHON_SYMBOL(PyExc_OverflowError)
+ PYTHON_SYMBOL(PyExc_RuntimeError)
+ PYTHON_SYMBOL(PyExc_SyntaxError)
+ PYTHON_SYMBOL(PyExc_SystemError)
+ PYTHON_SYMBOL(PyExc_TypeError)
+ PYTHON_SYMBOL(PyExc_ValueError)
+ PYTHON_SYMBOL(PyExc_ZeroDivisionError)
+
+ PYTHON_SYMBOL(PyFloat_FromDouble)
+ PYTHON_SYMBOL(PyImport_AddModule)
+ PYTHON_SYMBOL(PyImport_GetModuleDict)
+ PYTHON_SYMBOL(PyImport_ReloadModule)
+ PYTHON_SYMBOL(PyRun_String)
+ PYTHON_SYMBOL(PyType_IsSubtype)
{ "", NULL }
};
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
