blob: 08f50658832f5b67dc3fa6379e50acaf001954af [file] [log] [blame]
Guido van Rossumf70e43a1991-02-19 12:39:46 +00001
Guido van Rossum85a5fbb1990-10-14 12:07:46 +00002/* Module support implementation */
3
Guido van Rossum79f25d91997-04-29 20:08:16 +00004#include "Python.h"
Guido van Rossum85a5fbb1990-10-14 12:07:46 +00005
Thomas Wouters49fd7fa2006-04-21 10:40:58 +00006#define FLAG_SIZE_T 1
Guido van Rossum1d5735e1994-08-30 08:27:36 +00007typedef double va_double;
Guido van Rossum1d5735e1994-08-30 08:27:36 +00008
Thomas Wouters49fd7fa2006-04-21 10:40:58 +00009static PyObject *va_build_value(const char *, va_list, int);
10
Guido van Rossum2e58ff31997-11-19 18:53:33 +000011/* Package context -- the full module name for package imports */
12char *_Py_PackageContext = NULL;
13
Guido van Rossumbf80e541993-02-08 15:49:17 +000014/* Helper for mkvalue() to scan the length of a format */
Guido van Rossumfc61adb1992-04-13 15:53:41 +000015
Fred Drakeceead6d2003-01-30 15:08:25 +000016static int
Jeremy Hyltonaf68c872005-12-10 18:50:16 +000017countformat(const char *format, int endchar)
Guido van Rossumfc61adb1992-04-13 15:53:41 +000018{
Antoine Pitrouf95a1b32010-05-09 15:52:27 +000019 int count = 0;
20 int level = 0;
21 while (level > 0 || *format != endchar) {
22 switch (*format) {
23 case '\0':
24 /* Premature end */
25 PyErr_SetString(PyExc_SystemError,
26 "unmatched paren in format");
27 return -1;
28 case '(':
29 case '[':
30 case '{':
31 if (level == 0)
32 count++;
33 level++;
34 break;
35 case ')':
36 case ']':
37 case '}':
38 level--;
39 break;
40 case '#':
41 case '&':
42 case ',':
43 case ':':
44 case ' ':
45 case '\t':
46 break;
47 default:
48 if (level == 0)
49 count++;
50 }
51 format++;
52 }
53 return count;
Guido van Rossumfc61adb1992-04-13 15:53:41 +000054}
55
56
Guido van Rossumfc61adb1992-04-13 15:53:41 +000057/* Generic function to create a value -- the inverse of getargs() */
58/* After an original idea and first implementation by Steven Miale */
59
Thomas Wouters49fd7fa2006-04-21 10:40:58 +000060static PyObject *do_mktuple(const char**, va_list *, int, int, int);
61static PyObject *do_mklist(const char**, va_list *, int, int, int);
62static PyObject *do_mkdict(const char**, va_list *, int, int, int);
63static PyObject *do_mkvalue(const char**, va_list *, int);
Guido van Rossumfc61adb1992-04-13 15:53:41 +000064
Guido van Rossum1ae940a1995-01-02 19:04:15 +000065
Guido van Rossum79f25d91997-04-29 20:08:16 +000066static PyObject *
Thomas Wouters49fd7fa2006-04-21 10:40:58 +000067do_mkdict(const char **p_format, va_list *p_va, int endchar, int n, int flags)
Guido van Rossum1ae940a1995-01-02 19:04:15 +000068{
Antoine Pitrouf95a1b32010-05-09 15:52:27 +000069 PyObject *d;
70 int i;
71 int itemfailed = 0;
72 if (n < 0)
73 return NULL;
74 if ((d = PyDict_New()) == NULL)
75 return NULL;
76 /* Note that we can't bail immediately on error as this will leak
77 refcounts on any 'N' arguments. */
78 for (i = 0; i < n; i+= 2) {
79 PyObject *k, *v;
80 int err;
81 k = do_mkvalue(p_format, p_va, flags);
82 if (k == NULL) {
83 itemfailed = 1;
84 Py_INCREF(Py_None);
85 k = Py_None;
86 }
87 v = do_mkvalue(p_format, p_va, flags);
88 if (v == NULL) {
89 itemfailed = 1;
90 Py_INCREF(Py_None);
91 v = Py_None;
92 }
93 err = PyDict_SetItem(d, k, v);
94 Py_DECREF(k);
95 Py_DECREF(v);
96 if (err < 0 || itemfailed) {
97 Py_DECREF(d);
98 return NULL;
99 }
100 }
101 if (d != NULL && **p_format != endchar) {
102 Py_DECREF(d);
103 d = NULL;
104 PyErr_SetString(PyExc_SystemError,
105 "Unmatched paren in format");
106 }
107 else if (endchar)
108 ++*p_format;
109 return d;
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000110}
111
Guido van Rossum79f25d91997-04-29 20:08:16 +0000112static PyObject *
Thomas Wouters49fd7fa2006-04-21 10:40:58 +0000113do_mklist(const char **p_format, va_list *p_va, int endchar, int n, int flags)
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000114{
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000115 PyObject *v;
116 int i;
117 int itemfailed = 0;
118 if (n < 0)
119 return NULL;
120 v = PyList_New(n);
121 if (v == NULL)
122 return NULL;
123 /* Note that we can't bail immediately on error as this will leak
124 refcounts on any 'N' arguments. */
125 for (i = 0; i < n; i++) {
126 PyObject *w = do_mkvalue(p_format, p_va, flags);
127 if (w == NULL) {
128 itemfailed = 1;
129 Py_INCREF(Py_None);
130 w = Py_None;
131 }
132 PyList_SET_ITEM(v, i, w);
133 }
Neal Norwitz3e90fa52006-03-06 23:07:34 +0000134
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000135 if (itemfailed) {
136 /* do_mkvalue() should have already set an error */
137 Py_DECREF(v);
138 return NULL;
139 }
140 if (**p_format != endchar) {
141 Py_DECREF(v);
142 PyErr_SetString(PyExc_SystemError,
143 "Unmatched paren in format");
144 return NULL;
145 }
146 if (endchar)
147 ++*p_format;
148 return v;
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000149}
150
Fred Drake25d34472000-04-28 14:42:37 +0000151static int
152_ustrlen(Py_UNICODE *u)
153{
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000154 int i = 0;
155 Py_UNICODE *v = u;
156 while (*v != 0) { i++; v++; }
157 return i;
Fred Drake25d34472000-04-28 14:42:37 +0000158}
159
Guido van Rossum79f25d91997-04-29 20:08:16 +0000160static PyObject *
Thomas Wouters49fd7fa2006-04-21 10:40:58 +0000161do_mktuple(const char **p_format, va_list *p_va, int endchar, int n, int flags)
Guido van Rossumfc61adb1992-04-13 15:53:41 +0000162{
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000163 PyObject *v;
164 int i;
165 int itemfailed = 0;
166 if (n < 0)
167 return NULL;
168 if ((v = PyTuple_New(n)) == NULL)
169 return NULL;
170 /* Note that we can't bail immediately on error as this will leak
171 refcounts on any 'N' arguments. */
172 for (i = 0; i < n; i++) {
173 PyObject *w = do_mkvalue(p_format, p_va, flags);
174 if (w == NULL) {
175 itemfailed = 1;
176 Py_INCREF(Py_None);
177 w = Py_None;
178 }
179 PyTuple_SET_ITEM(v, i, w);
180 }
181 if (itemfailed) {
182 /* do_mkvalue() should have already set an error */
183 Py_DECREF(v);
184 return NULL;
185 }
186 if (**p_format != endchar) {
187 Py_DECREF(v);
188 PyErr_SetString(PyExc_SystemError,
189 "Unmatched paren in format");
190 return NULL;
191 }
192 if (endchar)
193 ++*p_format;
194 return v;
Guido van Rossumfc61adb1992-04-13 15:53:41 +0000195}
196
Guido van Rossum79f25d91997-04-29 20:08:16 +0000197static PyObject *
Thomas Wouters49fd7fa2006-04-21 10:40:58 +0000198do_mkvalue(const char **p_format, va_list *p_va, int flags)
Guido van Rossum899dcf31992-05-15 11:04:59 +0000199{
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000200 for (;;) {
201 switch (*(*p_format)++) {
202 case '(':
203 return do_mktuple(p_format, p_va, ')',
204 countformat(*p_format, ')'), flags);
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000205
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000206 case '[':
207 return do_mklist(p_format, p_va, ']',
208 countformat(*p_format, ']'), flags);
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000209
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000210 case '{':
211 return do_mkdict(p_format, p_va, '}',
212 countformat(*p_format, '}'), flags);
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000213
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000214 case 'b':
215 case 'B':
216 case 'h':
217 case 'i':
218 return PyLong_FromLong((long)va_arg(*p_va, int));
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000219
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000220 case 'H':
221 return PyLong_FromLong((long)va_arg(*p_va, unsigned int));
222
223 case 'I':
224 {
225 unsigned int n;
226 n = va_arg(*p_va, unsigned int);
227 return PyLong_FromUnsignedLong(n);
228 }
229
230 case 'n':
Martin v. Löwis18e16552006-02-15 17:27:45 +0000231#if SIZEOF_SIZE_T!=SIZEOF_LONG
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000232 return PyLong_FromSsize_t(va_arg(*p_va, Py_ssize_t));
Martin v. Löwis18e16552006-02-15 17:27:45 +0000233#endif
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000234 /* Fall through from 'n' to 'l' if Py_ssize_t is long */
235 case 'l':
236 return PyLong_FromLong(va_arg(*p_va, long));
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000237
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000238 case 'k':
239 {
240 unsigned long n;
241 n = va_arg(*p_va, unsigned long);
242 return PyLong_FromUnsignedLong(n);
243 }
Jack Jansendbd65032003-04-17 22:01:10 +0000244
Guido van Rossum3dbba6e1999-01-25 21:48:56 +0000245#ifdef HAVE_LONG_LONG
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000246 case 'L':
247 return PyLong_FromLongLong((PY_LONG_LONG)va_arg(*p_va, PY_LONG_LONG));
Jack Jansendbd65032003-04-17 22:01:10 +0000248
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000249 case 'K':
250 return PyLong_FromUnsignedLongLong((PY_LONG_LONG)va_arg(*p_va, unsigned PY_LONG_LONG));
Guido van Rossum1a8791e1998-08-04 22:46:29 +0000251#endif
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000252 case 'u':
253 {
254 PyObject *v;
255 Py_UNICODE *u = va_arg(*p_va, Py_UNICODE *);
256 Py_ssize_t n;
257 if (**p_format == '#') {
258 ++*p_format;
259 if (flags & FLAG_SIZE_T)
260 n = va_arg(*p_va, Py_ssize_t);
261 else
262 n = va_arg(*p_va, int);
263 }
264 else
265 n = -1;
266 if (u == NULL) {
267 v = Py_None;
268 Py_INCREF(v);
269 }
270 else {
271 if (n < 0)
272 n = _ustrlen(u);
273 v = PyUnicode_FromUnicode(u, n);
274 }
275 return v;
276 }
277 case 'f':
278 case 'd':
279 return PyFloat_FromDouble(
280 (double)va_arg(*p_va, va_double));
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000281
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000282 case 'D':
283 return PyComplex_FromCComplex(
284 *((Py_complex *)va_arg(*p_va, Py_complex *)));
Fred Drakeaec79242001-03-12 21:03:26 +0000285
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000286 case 'c':
287 {
288 char p[1];
289 p[0] = (char)va_arg(*p_va, int);
290 return PyBytes_FromStringAndSize(p, 1);
291 }
292 case 'C':
293 {
294 int i = va_arg(*p_va, int);
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000295 return PyUnicode_FromOrdinal(i);
296 }
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000297
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000298 case 's':
299 case 'z':
Victor Stinner7eeb5b52010-06-07 19:57:46 +0000300 case 'U': /* XXX deprecated alias */
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000301 {
302 PyObject *v;
303 char *str = va_arg(*p_va, char *);
304 Py_ssize_t n;
305 if (**p_format == '#') {
306 ++*p_format;
307 if (flags & FLAG_SIZE_T)
308 n = va_arg(*p_va, Py_ssize_t);
309 else
310 n = va_arg(*p_va, int);
311 }
312 else
313 n = -1;
314 if (str == NULL) {
315 v = Py_None;
316 Py_INCREF(v);
317 }
318 else {
319 if (n < 0) {
320 size_t m = strlen(str);
321 if (m > PY_SSIZE_T_MAX) {
322 PyErr_SetString(PyExc_OverflowError,
323 "string too long for Python string");
324 return NULL;
325 }
326 n = (Py_ssize_t)m;
327 }
328 v = PyUnicode_FromStringAndSize(str, n);
329 }
330 return v;
331 }
Walter Dörwaldd2034312007-05-18 16:29:38 +0000332
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000333 case 'y':
334 {
335 PyObject *v;
336 char *str = va_arg(*p_va, char *);
337 Py_ssize_t n;
338 if (**p_format == '#') {
339 ++*p_format;
340 if (flags & FLAG_SIZE_T)
341 n = va_arg(*p_va, Py_ssize_t);
342 else
343 n = va_arg(*p_va, int);
344 }
345 else
346 n = -1;
347 if (str == NULL) {
348 v = Py_None;
349 Py_INCREF(v);
350 }
351 else {
352 if (n < 0) {
353 size_t m = strlen(str);
354 if (m > PY_SSIZE_T_MAX) {
355 PyErr_SetString(PyExc_OverflowError,
356 "string too long for Python bytes");
357 return NULL;
358 }
359 n = (Py_ssize_t)m;
360 }
361 v = PyBytes_FromStringAndSize(str, n);
362 }
363 return v;
364 }
Walter Dörwald612344f2007-05-04 19:28:21 +0000365
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000366 case 'N':
367 case 'S':
368 case 'O':
369 if (**p_format == '&') {
370 typedef PyObject *(*converter)(void *);
371 converter func = va_arg(*p_va, converter);
372 void *arg = va_arg(*p_va, void *);
373 ++*p_format;
374 return (*func)(arg);
375 }
376 else {
377 PyObject *v;
378 v = va_arg(*p_va, PyObject *);
379 if (v != NULL) {
380 if (*(*p_format - 1) != 'N')
381 Py_INCREF(v);
382 }
383 else if (!PyErr_Occurred())
384 /* If a NULL was passed
385 * because a call that should
386 * have constructed a value
387 * failed, that's OK, and we
388 * pass the error on; but if
389 * no error occurred it's not
390 * clear that the caller knew
391 * what she was doing. */
392 PyErr_SetString(PyExc_SystemError,
393 "NULL object passed to Py_BuildValue");
394 return v;
395 }
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000396
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000397 case ':':
398 case ',':
399 case ' ':
400 case '\t':
401 break;
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000402
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000403 default:
404 PyErr_SetString(PyExc_SystemError,
405 "bad format char passed to Py_BuildValue");
406 return NULL;
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000407
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000408 }
409 }
Guido van Rossum3cfe6fa1992-04-13 10:48:55 +0000410}
411
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000412
Fred Drakeceead6d2003-01-30 15:08:25 +0000413PyObject *
Jeremy Hyltonaf68c872005-12-10 18:50:16 +0000414Py_BuildValue(const char *format, ...)
Guido van Rossum3cfe6fa1992-04-13 10:48:55 +0000415{
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000416 va_list va;
417 PyObject* retval;
418 va_start(va, format);
419 retval = va_build_value(format, va, 0);
420 va_end(va);
421 return retval;
Thomas Wouters49fd7fa2006-04-21 10:40:58 +0000422}
423
424PyObject *
425_Py_BuildValue_SizeT(const char *format, ...)
426{
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000427 va_list va;
428 PyObject* retval;
429 va_start(va, format);
430 retval = va_build_value(format, va, FLAG_SIZE_T);
431 va_end(va);
432 return retval;
Guido van Rossum3cfe6fa1992-04-13 10:48:55 +0000433}
Guido van Rossume5372401993-03-16 12:15:04 +0000434
Guido van Rossum79f25d91997-04-29 20:08:16 +0000435PyObject *
Jeremy Hyltonaf68c872005-12-10 18:50:16 +0000436Py_VaBuildValue(const char *format, va_list va)
Guido van Rossume5372401993-03-16 12:15:04 +0000437{
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000438 return va_build_value(format, va, 0);
Thomas Wouters49fd7fa2006-04-21 10:40:58 +0000439}
440
441PyObject *
442_Py_VaBuildValue_SizeT(const char *format, va_list va)
443{
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000444 return va_build_value(format, va, FLAG_SIZE_T);
Thomas Wouters49fd7fa2006-04-21 10:40:58 +0000445}
446
447static PyObject *
448va_build_value(const char *format, va_list va, int flags)
449{
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000450 const char *f = format;
451 int n = countformat(f, '\0');
452 va_list lva;
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000453
Alexander Belopolskyf0f45142010-08-11 17:31:17 +0000454 Py_VA_COPY(lva, va);
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000455
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000456 if (n < 0)
457 return NULL;
458 if (n == 0) {
459 Py_INCREF(Py_None);
460 return Py_None;
461 }
462 if (n == 1)
463 return do_mkvalue(&f, &lva, flags);
464 return do_mktuple(&f, &lva, '\0', n, flags);
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000465}
466
467
Guido van Rossum79f25d91997-04-29 20:08:16 +0000468PyObject *
Jeremy Hyltonaf68c872005-12-10 18:50:16 +0000469PyEval_CallFunction(PyObject *obj, const char *format, ...)
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000470{
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000471 va_list vargs;
472 PyObject *args;
473 PyObject *res;
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000474
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000475 va_start(vargs, format);
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000476
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000477 args = Py_VaBuildValue(format, vargs);
478 va_end(vargs);
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000479
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000480 if (args == NULL)
481 return NULL;
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000482
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000483 res = PyEval_CallObject(obj, args);
484 Py_DECREF(args);
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000485
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000486 return res;
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000487}
488
489
Guido van Rossum79f25d91997-04-29 20:08:16 +0000490PyObject *
Jeremy Hyltonaf68c872005-12-10 18:50:16 +0000491PyEval_CallMethod(PyObject *obj, const char *methodname, const char *format, ...)
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000492{
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000493 va_list vargs;
494 PyObject *meth;
495 PyObject *args;
496 PyObject *res;
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000497
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000498 meth = PyObject_GetAttrString(obj, methodname);
499 if (meth == NULL)
500 return NULL;
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000501
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000502 va_start(vargs, format);
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000503
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000504 args = Py_VaBuildValue(format, vargs);
505 va_end(vargs);
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000506
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000507 if (args == NULL) {
508 Py_DECREF(meth);
509 return NULL;
510 }
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000511
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000512 res = PyEval_CallObject(meth, args);
513 Py_DECREF(meth);
514 Py_DECREF(args);
Guido van Rossum1ae940a1995-01-02 19:04:15 +0000515
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000516 return res;
Guido van Rossume5372401993-03-16 12:15:04 +0000517}
Fred Drake9e285152000-09-23 03:24:27 +0000518
519int
Jeremy Hyltonaf68c872005-12-10 18:50:16 +0000520PyModule_AddObject(PyObject *m, const char *name, PyObject *o)
Fred Drake9e285152000-09-23 03:24:27 +0000521{
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000522 PyObject *dict;
523 if (!PyModule_Check(m)) {
524 PyErr_SetString(PyExc_TypeError,
525 "PyModule_AddObject() needs module as first arg");
526 return -1;
527 }
528 if (!o) {
529 if (!PyErr_Occurred())
530 PyErr_SetString(PyExc_TypeError,
531 "PyModule_AddObject() needs non-NULL value");
532 return -1;
533 }
Jeremy Hyltonc44dbc42003-06-21 21:35:25 +0000534
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000535 dict = PyModule_GetDict(m);
536 if (dict == NULL) {
537 /* Internal error -- modules must have a dict! */
538 PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__",
539 PyModule_GetName(m));
540 return -1;
541 }
542 if (PyDict_SetItemString(dict, name, o))
543 return -1;
544 Py_DECREF(o);
545 return 0;
Fred Drake9e285152000-09-23 03:24:27 +0000546}
547
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000548int
Jeremy Hyltonaf68c872005-12-10 18:50:16 +0000549PyModule_AddIntConstant(PyObject *m, const char *name, long value)
Fred Drake9e285152000-09-23 03:24:27 +0000550{
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000551 PyObject *o = PyLong_FromLong(value);
552 if (!o)
553 return -1;
554 if (PyModule_AddObject(m, name, o) == 0)
555 return 0;
556 Py_DECREF(o);
557 return -1;
Fred Drake9e285152000-09-23 03:24:27 +0000558}
559
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000560int
Jeremy Hyltonaf68c872005-12-10 18:50:16 +0000561PyModule_AddStringConstant(PyObject *m, const char *name, const char *value)
Fred Drake9e285152000-09-23 03:24:27 +0000562{
Antoine Pitrouf95a1b32010-05-09 15:52:27 +0000563 PyObject *o = PyUnicode_FromString(value);
564 if (!o)
565 return -1;
566 if (PyModule_AddObject(m, name, o) == 0)
567 return 0;
568 Py_DECREF(o);
569 return -1;
Fred Drake9e285152000-09-23 03:24:27 +0000570}