summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2000-09-23 03:24:27 (GMT)
committerFred Drake <fdrake@acm.org>2000-09-23 03:24:27 (GMT)
commit9e2851566c0dd1d27d29ead8988f4cc3ae295ca1 (patch)
tree0e35fe3b2d9b2ccbc82acdc1b41ea445580c3b66
parentf84fb660cbd7f66bacf2e58dbafd950f43f6e216 (diff)
downloadcpython-9e2851566c0dd1d27d29ead8988f4cc3ae295ca1.zip
cpython-9e2851566c0dd1d27d29ead8988f4cc3ae295ca1.tar.gz
cpython-9e2851566c0dd1d27d29ead8988f4cc3ae295ca1.tar.bz2
Andrew Kuchling <akuchlin@mems-exchange.org>:
Add three new convenience functions to the PyModule_*() family: PyModule_AddObject(), PyModule_AddIntConstant(), PyModule_AddStringConstant(). This closes SourceForge patch #101233.
-rw-r--r--Include/modsupport.h4
-rw-r--r--Python/modsupport.c27
2 files changed, 31 insertions, 0 deletions
diff --git a/Include/modsupport.h b/Include/modsupport.h
index a678257..54c7add 100644
--- a/Include/modsupport.h
+++ b/Include/modsupport.h
@@ -18,6 +18,10 @@ extern DL_IMPORT(PyObject *) Py_BuildValue(char *, ...);
extern DL_IMPORT(int) PyArg_VaParse(PyObject *, char *, va_list);
extern DL_IMPORT(PyObject *) Py_VaBuildValue(char *, va_list);
+extern DL_IMPORT(int) PyModule_AddObject(PyObject *, char *, PyObject *);
+extern DL_IMPORT(int) PyModule_AddIntConstant(PyObject *, char *, long);
+extern DL_IMPORT(int) PyModule_AddStringConstant(PyObject *, char *, char *);
+
#define PYTHON_API_VERSION 1009
#define PYTHON_API_STRING "1009"
/* The API version is maintained (independently from the Python version)
diff --git a/Python/modsupport.c b/Python/modsupport.c
index c87f994..9c2dc18 100644
--- a/Python/modsupport.c
+++ b/Python/modsupport.c
@@ -459,3 +459,30 @@ PyEval_CallMethod(PyObject *obj, char *methodname, char *format, ...)
return res;
}
+
+int
+PyModule_AddObject(PyObject *m, char *name, PyObject *o)
+{
+ PyObject *dict;
+ if (!PyModule_Check(m) || o == NULL)
+ return -1;
+ dict = PyModule_GetDict(m);
+ if (dict == NULL)
+ return -1;
+ if (PyDict_SetItemString(dict, name, o))
+ return -1;
+ Py_DECREF(o);
+ return 0;
+}
+
+int
+PyModule_AddIntConstant(PyObject *m, char *name, long value)
+{
+ return PyModule_AddObject(m, name, PyInt_FromLong(value));
+}
+
+int
+PyModule_AddStringConstant(PyObject *m, char *name, char *value)
+{
+ return PyModule_AddObject(m, name, PyString_FromString(value));
+}