Guido van Rossum | f70e43a | 1991-02-19 12:39:46 +0000 | [diff] [blame] | 1 | |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 2 | /* Module support implementation */ |
| 3 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 4 | #include "Python.h" |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 5 | |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 6 | #define FLAG_SIZE_T 1 |
Guido van Rossum | 1d5735e | 1994-08-30 08:27:36 +0000 | [diff] [blame] | 7 | typedef double va_double; |
Guido van Rossum | 1d5735e | 1994-08-30 08:27:36 +0000 | [diff] [blame] | 8 | |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 9 | static PyObject *va_build_value(const char *, va_list, int); |
| 10 | |
Guido van Rossum | 2e58ff3 | 1997-11-19 18:53:33 +0000 | [diff] [blame] | 11 | /* Package context -- the full module name for package imports */ |
| 12 | char *_Py_PackageContext = NULL; |
| 13 | |
Guido van Rossum | bf80e54 | 1993-02-08 15:49:17 +0000 | [diff] [blame] | 14 | /* Helper for mkvalue() to scan the length of a format */ |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 15 | |
Fred Drake | ceead6d | 2003-01-30 15:08:25 +0000 | [diff] [blame] | 16 | static int |
Jeremy Hylton | af68c87 | 2005-12-10 18:50:16 +0000 | [diff] [blame] | 17 | countformat(const char *format, int endchar) |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 18 | { |
| 19 | int count = 0; |
| 20 | int level = 0; |
| 21 | while (level > 0 || *format != endchar) { |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 22 | switch (*format) { |
| 23 | case '\0': |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 24 | /* Premature end */ |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 25 | PyErr_SetString(PyExc_SystemError, |
| 26 | "unmatched paren in format"); |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 27 | return -1; |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 28 | case '(': |
| 29 | case '[': |
| 30 | case '{': |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 31 | if (level == 0) |
| 32 | count++; |
| 33 | level++; |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 34 | break; |
| 35 | case ')': |
| 36 | case ']': |
| 37 | case '}': |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 38 | level--; |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 39 | break; |
| 40 | case '#': |
Guido van Rossum | d1b9393 | 1995-01-20 16:56:02 +0000 | [diff] [blame] | 41 | case '&': |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 42 | case ',': |
| 43 | case ':': |
| 44 | case ' ': |
| 45 | case '\t': |
| 46 | break; |
| 47 | default: |
| 48 | if (level == 0) |
| 49 | count++; |
| 50 | } |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 51 | format++; |
| 52 | } |
| 53 | return count; |
| 54 | } |
| 55 | |
| 56 | |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 57 | /* Generic function to create a value -- the inverse of getargs() */ |
| 58 | /* After an original idea and first implementation by Steven Miale */ |
| 59 | |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 60 | static PyObject *do_mktuple(const char**, va_list *, int, int, int); |
| 61 | static PyObject *do_mklist(const char**, va_list *, int, int, int); |
| 62 | static PyObject *do_mkdict(const char**, va_list *, int, int, int); |
| 63 | static PyObject *do_mkvalue(const char**, va_list *, int); |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 64 | |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 65 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 66 | static PyObject * |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 67 | do_mkdict(const char **p_format, va_list *p_va, int endchar, int n, int flags) |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 68 | { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 69 | PyObject *d; |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 70 | int i; |
Michael W. Hudson | c849e63 | 2004-07-14 11:28:06 +0000 | [diff] [blame] | 71 | int itemfailed = 0; |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 72 | if (n < 0) |
| 73 | return NULL; |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 74 | if ((d = PyDict_New()) == NULL) |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 75 | return NULL; |
Michael W. Hudson | c849e63 | 2004-07-14 11:28:06 +0000 | [diff] [blame] | 76 | /* Note that we can't bail immediately on error as this will leak |
| 77 | refcounts on any 'N' arguments. */ |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 78 | for (i = 0; i < n; i+= 2) { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 79 | PyObject *k, *v; |
Guido van Rossum | db847bd | 1997-11-20 20:35:45 +0000 | [diff] [blame] | 80 | int err; |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 81 | k = do_mkvalue(p_format, p_va, flags); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 82 | if (k == NULL) { |
Michael W. Hudson | c849e63 | 2004-07-14 11:28:06 +0000 | [diff] [blame] | 83 | itemfailed = 1; |
| 84 | Py_INCREF(Py_None); |
| 85 | k = Py_None; |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 86 | } |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 87 | v = do_mkvalue(p_format, p_va, flags); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 88 | if (v == NULL) { |
Michael W. Hudson | c849e63 | 2004-07-14 11:28:06 +0000 | [diff] [blame] | 89 | itemfailed = 1; |
| 90 | Py_INCREF(Py_None); |
| 91 | v = Py_None; |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 92 | } |
Guido van Rossum | db847bd | 1997-11-20 20:35:45 +0000 | [diff] [blame] | 93 | err = PyDict_SetItem(d, k, v); |
| 94 | Py_DECREF(k); |
| 95 | Py_DECREF(v); |
Michael W. Hudson | c849e63 | 2004-07-14 11:28:06 +0000 | [diff] [blame] | 96 | if (err < 0 || itemfailed) { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 97 | Py_DECREF(d); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 98 | return NULL; |
| 99 | } |
| 100 | } |
| 101 | if (d != NULL && **p_format != endchar) { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 102 | Py_DECREF(d); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 103 | d = NULL; |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 104 | PyErr_SetString(PyExc_SystemError, |
| 105 | "Unmatched paren in format"); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 106 | } |
| 107 | else if (endchar) |
| 108 | ++*p_format; |
| 109 | return d; |
| 110 | } |
| 111 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 112 | static PyObject * |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 113 | do_mklist(const char **p_format, va_list *p_va, int endchar, int n, int flags) |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 114 | { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 115 | PyObject *v; |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 116 | int i; |
Michael W. Hudson | c849e63 | 2004-07-14 11:28:06 +0000 | [diff] [blame] | 117 | int itemfailed = 0; |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 118 | if (n < 0) |
| 119 | return NULL; |
Neal Norwitz | 3e90fa5 | 2006-03-06 23:07:34 +0000 | [diff] [blame] | 120 | v = PyList_New(n); |
| 121 | if (v == NULL) |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 122 | return NULL; |
Michael W. Hudson | c849e63 | 2004-07-14 11:28:06 +0000 | [diff] [blame] | 123 | /* Note that we can't bail immediately on error as this will leak |
| 124 | refcounts on any 'N' arguments. */ |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 125 | for (i = 0; i < n; i++) { |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 126 | PyObject *w = do_mkvalue(p_format, p_va, flags); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 127 | if (w == NULL) { |
Michael W. Hudson | c849e63 | 2004-07-14 11:28:06 +0000 | [diff] [blame] | 128 | itemfailed = 1; |
| 129 | Py_INCREF(Py_None); |
| 130 | w = Py_None; |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 131 | } |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 132 | PyList_SET_ITEM(v, i, w); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 133 | } |
Neal Norwitz | 3e90fa5 | 2006-03-06 23:07:34 +0000 | [diff] [blame] | 134 | |
| 135 | if (itemfailed) { |
| 136 | /* do_mkvalue() should have already set an error */ |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 137 | Py_DECREF(v); |
Neal Norwitz | 3e90fa5 | 2006-03-06 23:07:34 +0000 | [diff] [blame] | 138 | return NULL; |
| 139 | } |
| 140 | if (**p_format != endchar) { |
| 141 | Py_DECREF(v); |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 142 | PyErr_SetString(PyExc_SystemError, |
| 143 | "Unmatched paren in format"); |
Neal Norwitz | 3e90fa5 | 2006-03-06 23:07:34 +0000 | [diff] [blame] | 144 | return NULL; |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 145 | } |
Neal Norwitz | 3e90fa5 | 2006-03-06 23:07:34 +0000 | [diff] [blame] | 146 | if (endchar) |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 147 | ++*p_format; |
| 148 | return v; |
| 149 | } |
| 150 | |
Fred Drake | 25d3447 | 2000-04-28 14:42:37 +0000 | [diff] [blame] | 151 | static int |
| 152 | _ustrlen(Py_UNICODE *u) |
| 153 | { |
| 154 | int i = 0; |
| 155 | Py_UNICODE *v = u; |
| 156 | while (*v != 0) { i++; v++; } |
| 157 | return i; |
| 158 | } |
| 159 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 160 | static PyObject * |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 161 | do_mktuple(const char **p_format, va_list *p_va, int endchar, int n, int flags) |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 162 | { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 163 | PyObject *v; |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 164 | int i; |
Michael W. Hudson | c849e63 | 2004-07-14 11:28:06 +0000 | [diff] [blame] | 165 | int itemfailed = 0; |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 166 | if (n < 0) |
| 167 | return NULL; |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 168 | if ((v = PyTuple_New(n)) == NULL) |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 169 | return NULL; |
Michael W. Hudson | c849e63 | 2004-07-14 11:28:06 +0000 | [diff] [blame] | 170 | /* Note that we can't bail immediately on error as this will leak |
| 171 | refcounts on any 'N' arguments. */ |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 172 | for (i = 0; i < n; i++) { |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 173 | PyObject *w = do_mkvalue(p_format, p_va, flags); |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 174 | if (w == NULL) { |
Michael W. Hudson | c849e63 | 2004-07-14 11:28:06 +0000 | [diff] [blame] | 175 | itemfailed = 1; |
| 176 | Py_INCREF(Py_None); |
| 177 | w = Py_None; |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 178 | } |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 179 | PyTuple_SET_ITEM(v, i, w); |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 180 | } |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 181 | if (itemfailed) { |
| 182 | /* do_mkvalue() should have already set an error */ |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 183 | Py_DECREF(v); |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 184 | return NULL; |
| 185 | } |
| 186 | if (**p_format != endchar) { |
| 187 | Py_DECREF(v); |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 188 | PyErr_SetString(PyExc_SystemError, |
| 189 | "Unmatched paren in format"); |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 190 | return NULL; |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 191 | } |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 192 | if (endchar) |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 193 | ++*p_format; |
| 194 | return v; |
| 195 | } |
| 196 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 197 | static PyObject * |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 198 | do_mkvalue(const char **p_format, va_list *p_va, int flags) |
Guido van Rossum | 899dcf3 | 1992-05-15 11:04:59 +0000 | [diff] [blame] | 199 | { |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 200 | for (;;) { |
| 201 | switch (*(*p_format)++) { |
| 202 | case '(': |
| 203 | return do_mktuple(p_format, p_va, ')', |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 204 | countformat(*p_format, ')'), flags); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 205 | |
| 206 | case '[': |
| 207 | return do_mklist(p_format, p_va, ']', |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 208 | countformat(*p_format, ']'), flags); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 209 | |
| 210 | case '{': |
| 211 | return do_mkdict(p_format, p_va, '}', |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 212 | countformat(*p_format, '}'), flags); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 213 | |
| 214 | case 'b': |
Jack Jansen | b763b9d | 2000-09-15 12:51:01 +0000 | [diff] [blame] | 215 | case 'B': |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 216 | case 'h': |
| 217 | case 'i': |
Christian Heimes | 217cfd1 | 2007-12-02 14:31:20 +0000 | [diff] [blame] | 218 | return PyLong_FromLong((long)va_arg(*p_va, int)); |
Jack Jansen | d50338f | 2000-07-06 12:22:00 +0000 | [diff] [blame] | 219 | |
| 220 | case 'H': |
Christian Heimes | 217cfd1 | 2007-12-02 14:31:20 +0000 | [diff] [blame] | 221 | return PyLong_FromLong((long)va_arg(*p_va, unsigned int)); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 222 | |
Georg Brandl | f06e30a | 2005-11-24 15:37:42 +0000 | [diff] [blame] | 223 | case 'I': |
| 224 | { |
| 225 | unsigned int n; |
| 226 | n = va_arg(*p_va, unsigned int); |
Martin v. Löwis | 327858e | 2007-12-04 22:18:27 +0000 | [diff] [blame] | 227 | return PyLong_FromUnsignedLong(n); |
Georg Brandl | f06e30a | 2005-11-24 15:37:42 +0000 | [diff] [blame] | 228 | } |
| 229 | |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 230 | case 'n': |
| 231 | #if SIZEOF_SIZE_T!=SIZEOF_LONG |
Christian Heimes | 217cfd1 | 2007-12-02 14:31:20 +0000 | [diff] [blame] | 232 | return PyLong_FromSsize_t(va_arg(*p_va, Py_ssize_t)); |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 233 | #endif |
| 234 | /* Fall through from 'n' to 'l' if Py_ssize_t is long */ |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 235 | case 'l': |
Christian Heimes | 217cfd1 | 2007-12-02 14:31:20 +0000 | [diff] [blame] | 236 | return PyLong_FromLong(va_arg(*p_va, long)); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 237 | |
Jack Jansen | dbd6503 | 2003-04-17 22:01:10 +0000 | [diff] [blame] | 238 | case 'k': |
Georg Brandl | f06e30a | 2005-11-24 15:37:42 +0000 | [diff] [blame] | 239 | { |
| 240 | unsigned long n; |
| 241 | n = va_arg(*p_va, unsigned long); |
Martin v. Löwis | 327858e | 2007-12-04 22:18:27 +0000 | [diff] [blame] | 242 | return PyLong_FromUnsignedLong(n); |
Georg Brandl | f06e30a | 2005-11-24 15:37:42 +0000 | [diff] [blame] | 243 | } |
Jack Jansen | dbd6503 | 2003-04-17 22:01:10 +0000 | [diff] [blame] | 244 | |
Guido van Rossum | 3dbba6e | 1999-01-25 21:48:56 +0000 | [diff] [blame] | 245 | #ifdef HAVE_LONG_LONG |
Guido van Rossum | 1a8791e | 1998-08-04 22:46:29 +0000 | [diff] [blame] | 246 | case 'L': |
Martin v. Löwis | b9a0f91 | 2003-03-29 10:06:18 +0000 | [diff] [blame] | 247 | return PyLong_FromLongLong((PY_LONG_LONG)va_arg(*p_va, PY_LONG_LONG)); |
Jack Jansen | dbd6503 | 2003-04-17 22:01:10 +0000 | [diff] [blame] | 248 | |
| 249 | case 'K': |
Georg Brandl | f06e30a | 2005-11-24 15:37:42 +0000 | [diff] [blame] | 250 | return PyLong_FromUnsignedLongLong((PY_LONG_LONG)va_arg(*p_va, unsigned PY_LONG_LONG)); |
Guido van Rossum | 1a8791e | 1998-08-04 22:46:29 +0000 | [diff] [blame] | 251 | #endif |
Fred Drake | 25d3447 | 2000-04-28 14:42:37 +0000 | [diff] [blame] | 252 | case 'u': |
| 253 | { |
| 254 | PyObject *v; |
| 255 | Py_UNICODE *u = va_arg(*p_va, Py_UNICODE *); |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 256 | Py_ssize_t n; |
Fred Drake | 25d3447 | 2000-04-28 14:42:37 +0000 | [diff] [blame] | 257 | if (**p_format == '#') { |
| 258 | ++*p_format; |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 259 | if (flags & FLAG_SIZE_T) |
| 260 | n = va_arg(*p_va, Py_ssize_t); |
| 261 | else |
| 262 | n = va_arg(*p_va, int); |
Fred Drake | 25d3447 | 2000-04-28 14:42:37 +0000 | [diff] [blame] | 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 | } |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 277 | case 'f': |
| 278 | case 'd': |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 279 | return PyFloat_FromDouble( |
| 280 | (double)va_arg(*p_va, va_double)); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 281 | |
Fred Drake | aec7924 | 2001-03-12 21:03:26 +0000 | [diff] [blame] | 282 | #ifndef WITHOUT_COMPLEX |
| 283 | case 'D': |
| 284 | return PyComplex_FromCComplex( |
| 285 | *((Py_complex *)va_arg(*p_va, Py_complex *))); |
| 286 | #endif /* WITHOUT_COMPLEX */ |
| 287 | |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 288 | case 'c': |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 289 | { |
Walter Dörwald | d094130 | 2007-07-01 21:58:22 +0000 | [diff] [blame] | 290 | char p[1]; |
| 291 | p[0] = (char)va_arg(*p_va, int); |
Martin v. Löwis | 10a60b3 | 2007-07-18 02:28:27 +0000 | [diff] [blame] | 292 | return PyUnicode_FromStringAndSize(p, 1); |
Walter Dörwald | d094130 | 2007-07-01 21:58:22 +0000 | [diff] [blame] | 293 | } |
| 294 | case 'C': |
| 295 | { |
Walter Dörwald | bc1f886 | 2007-06-20 11:02:38 +0000 | [diff] [blame] | 296 | int i = va_arg(*p_va, int); |
| 297 | Py_UNICODE c; |
| 298 | if (i < 0 || i > PyUnicode_GetMax()) { |
| 299 | #ifdef Py_UNICODE_WIDE |
| 300 | PyErr_SetString(PyExc_OverflowError, |
| 301 | "%c arg not in range(0x110000) " |
| 302 | "(wide Python build)"); |
| 303 | #else |
| 304 | PyErr_SetString(PyExc_OverflowError, |
| 305 | "%c arg not in range(0x10000) " |
| 306 | "(narrow Python build)"); |
| 307 | #endif |
| 308 | return NULL; |
| 309 | } |
| 310 | c = i; |
| 311 | return PyUnicode_FromUnicode(&c, 1); |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 312 | } |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 313 | |
| 314 | case 's': |
| 315 | case 'z': |
Guido van Rossum | 3cfe6fa | 1992-04-13 10:48:55 +0000 | [diff] [blame] | 316 | { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 317 | PyObject *v; |
Guido van Rossum | 3cfe6fa | 1992-04-13 10:48:55 +0000 | [diff] [blame] | 318 | char *str = va_arg(*p_va, char *); |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 319 | Py_ssize_t n; |
Guido van Rossum | 3cfe6fa | 1992-04-13 10:48:55 +0000 | [diff] [blame] | 320 | if (**p_format == '#') { |
| 321 | ++*p_format; |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 322 | if (flags & FLAG_SIZE_T) |
| 323 | n = va_arg(*p_va, Py_ssize_t); |
| 324 | else |
| 325 | n = va_arg(*p_va, int); |
Guido van Rossum | 3cfe6fa | 1992-04-13 10:48:55 +0000 | [diff] [blame] | 326 | } |
| 327 | else |
| 328 | n = -1; |
| 329 | if (str == NULL) { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 330 | v = Py_None; |
| 331 | Py_INCREF(v); |
Guido van Rossum | 3cfe6fa | 1992-04-13 10:48:55 +0000 | [diff] [blame] | 332 | } |
| 333 | else { |
Guido van Rossum | 582acec | 2000-06-28 22:07:35 +0000 | [diff] [blame] | 334 | if (n < 0) { |
| 335 | size_t m = strlen(str); |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 336 | if (m > PY_SSIZE_T_MAX) { |
Guido van Rossum | 582acec | 2000-06-28 22:07:35 +0000 | [diff] [blame] | 337 | PyErr_SetString(PyExc_OverflowError, |
| 338 | "string too long for Python string"); |
| 339 | return NULL; |
| 340 | } |
Thomas Wouters | 89f507f | 2006-12-13 04:49:30 +0000 | [diff] [blame] | 341 | n = (Py_ssize_t)m; |
Guido van Rossum | 582acec | 2000-06-28 22:07:35 +0000 | [diff] [blame] | 342 | } |
Martin v. Löwis | 10a60b3 | 2007-07-18 02:28:27 +0000 | [diff] [blame] | 343 | v = PyUnicode_FromStringAndSize(str, n); |
Guido van Rossum | 3cfe6fa | 1992-04-13 10:48:55 +0000 | [diff] [blame] | 344 | } |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 345 | return v; |
Guido van Rossum | 3cfe6fa | 1992-04-13 10:48:55 +0000 | [diff] [blame] | 346 | } |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 347 | |
Walter Dörwald | d203431 | 2007-05-18 16:29:38 +0000 | [diff] [blame] | 348 | case 'U': |
| 349 | { |
| 350 | PyObject *v; |
| 351 | char *str = va_arg(*p_va, char *); |
| 352 | Py_ssize_t n; |
| 353 | if (**p_format == '#') { |
| 354 | ++*p_format; |
| 355 | if (flags & FLAG_SIZE_T) |
| 356 | n = va_arg(*p_va, Py_ssize_t); |
| 357 | else |
| 358 | n = va_arg(*p_va, int); |
| 359 | } |
| 360 | else |
| 361 | n = -1; |
| 362 | if (str == NULL) { |
| 363 | v = Py_None; |
| 364 | Py_INCREF(v); |
| 365 | } |
| 366 | else { |
| 367 | if (n < 0) { |
| 368 | size_t m = strlen(str); |
| 369 | if (m > PY_SSIZE_T_MAX) { |
| 370 | PyErr_SetString(PyExc_OverflowError, |
| 371 | "string too long for Python string"); |
| 372 | return NULL; |
| 373 | } |
| 374 | n = (Py_ssize_t)m; |
| 375 | } |
| 376 | v = PyUnicode_FromStringAndSize(str, n); |
| 377 | } |
| 378 | return v; |
| 379 | } |
| 380 | |
Walter Dörwald | 612344f | 2007-05-04 19:28:21 +0000 | [diff] [blame] | 381 | case 'y': |
| 382 | { |
| 383 | PyObject *v; |
| 384 | char *str = va_arg(*p_va, char *); |
| 385 | Py_ssize_t n; |
| 386 | if (**p_format == '#') { |
| 387 | ++*p_format; |
| 388 | if (flags & FLAG_SIZE_T) |
| 389 | n = va_arg(*p_va, Py_ssize_t); |
| 390 | else |
| 391 | n = va_arg(*p_va, int); |
| 392 | } |
| 393 | else |
| 394 | n = -1; |
| 395 | if (str == NULL) { |
| 396 | v = Py_None; |
| 397 | Py_INCREF(v); |
| 398 | } |
| 399 | else { |
| 400 | if (n < 0) { |
| 401 | size_t m = strlen(str); |
| 402 | if (m > PY_SSIZE_T_MAX) { |
| 403 | PyErr_SetString(PyExc_OverflowError, |
| 404 | "string too long for Python bytes"); |
| 405 | return NULL; |
| 406 | } |
| 407 | n = (Py_ssize_t)m; |
| 408 | } |
Christian Heimes | 72b710a | 2008-05-26 13:28:38 +0000 | [diff] [blame] | 409 | v = PyBytes_FromStringAndSize(str, n); |
Walter Dörwald | 612344f | 2007-05-04 19:28:21 +0000 | [diff] [blame] | 410 | } |
| 411 | return v; |
| 412 | } |
| 413 | |
Guido van Rossum | d341500 | 1998-12-23 05:01:38 +0000 | [diff] [blame] | 414 | case 'N': |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 415 | case 'S': |
| 416 | case 'O': |
Guido van Rossum | d1b9393 | 1995-01-20 16:56:02 +0000 | [diff] [blame] | 417 | if (**p_format == '&') { |
Tim Peters | dbd9ba6 | 2000-07-09 03:09:57 +0000 | [diff] [blame] | 418 | typedef PyObject *(*converter)(void *); |
Guido van Rossum | d1b9393 | 1995-01-20 16:56:02 +0000 | [diff] [blame] | 419 | converter func = va_arg(*p_va, converter); |
| 420 | void *arg = va_arg(*p_va, void *); |
| 421 | ++*p_format; |
| 422 | return (*func)(arg); |
| 423 | } |
| 424 | else { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 425 | PyObject *v; |
| 426 | v = va_arg(*p_va, PyObject *); |
Guido van Rossum | c38e7d4 | 1998-12-23 19:53:45 +0000 | [diff] [blame] | 427 | if (v != NULL) { |
Guido van Rossum | d341500 | 1998-12-23 05:01:38 +0000 | [diff] [blame] | 428 | if (*(*p_format - 1) != 'N') |
| 429 | Py_INCREF(v); |
Guido van Rossum | c38e7d4 | 1998-12-23 19:53:45 +0000 | [diff] [blame] | 430 | } |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 431 | else if (!PyErr_Occurred()) |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 432 | /* If a NULL was passed |
| 433 | * because a call that should |
| 434 | * have constructed a value |
| 435 | * failed, that's OK, and we |
| 436 | * pass the error on; but if |
| 437 | * no error occurred it's not |
| 438 | * clear that the caller knew |
| 439 | * what she was doing. */ |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 440 | PyErr_SetString(PyExc_SystemError, |
Guido van Rossum | 233f4b5 | 1998-07-07 22:32:19 +0000 | [diff] [blame] | 441 | "NULL object passed to Py_BuildValue"); |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 442 | return v; |
Guido van Rossum | 3cfe6fa | 1992-04-13 10:48:55 +0000 | [diff] [blame] | 443 | } |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 444 | |
| 445 | case ':': |
| 446 | case ',': |
| 447 | case ' ': |
| 448 | case '\t': |
| 449 | break; |
| 450 | |
| 451 | default: |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 452 | PyErr_SetString(PyExc_SystemError, |
Guido van Rossum | 233f4b5 | 1998-07-07 22:32:19 +0000 | [diff] [blame] | 453 | "bad format char passed to Py_BuildValue"); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 454 | return NULL; |
| 455 | |
| 456 | } |
Guido van Rossum | 3cfe6fa | 1992-04-13 10:48:55 +0000 | [diff] [blame] | 457 | } |
Guido van Rossum | 3cfe6fa | 1992-04-13 10:48:55 +0000 | [diff] [blame] | 458 | } |
| 459 | |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 460 | |
Fred Drake | ceead6d | 2003-01-30 15:08:25 +0000 | [diff] [blame] | 461 | PyObject * |
Jeremy Hylton | af68c87 | 2005-12-10 18:50:16 +0000 | [diff] [blame] | 462 | Py_BuildValue(const char *format, ...) |
Guido van Rossum | 3cfe6fa | 1992-04-13 10:48:55 +0000 | [diff] [blame] | 463 | { |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 464 | va_list va; |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 465 | PyObject* retval; |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 466 | va_start(va, format); |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 467 | retval = va_build_value(format, va, 0); |
| 468 | va_end(va); |
| 469 | return retval; |
| 470 | } |
| 471 | |
| 472 | PyObject * |
| 473 | _Py_BuildValue_SizeT(const char *format, ...) |
| 474 | { |
| 475 | va_list va; |
| 476 | PyObject* retval; |
| 477 | va_start(va, format); |
| 478 | retval = va_build_value(format, va, FLAG_SIZE_T); |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 479 | va_end(va); |
Guido van Rossum | fc61adb | 1992-04-13 15:53:41 +0000 | [diff] [blame] | 480 | return retval; |
Guido van Rossum | 3cfe6fa | 1992-04-13 10:48:55 +0000 | [diff] [blame] | 481 | } |
Guido van Rossum | e537240 | 1993-03-16 12:15:04 +0000 | [diff] [blame] | 482 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 483 | PyObject * |
Jeremy Hylton | af68c87 | 2005-12-10 18:50:16 +0000 | [diff] [blame] | 484 | Py_VaBuildValue(const char *format, va_list va) |
Guido van Rossum | e537240 | 1993-03-16 12:15:04 +0000 | [diff] [blame] | 485 | { |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 486 | return va_build_value(format, va, 0); |
| 487 | } |
| 488 | |
| 489 | PyObject * |
| 490 | _Py_VaBuildValue_SizeT(const char *format, va_list va) |
| 491 | { |
| 492 | return va_build_value(format, va, FLAG_SIZE_T); |
| 493 | } |
| 494 | |
| 495 | static PyObject * |
| 496 | va_build_value(const char *format, va_list va, int flags) |
| 497 | { |
Jeremy Hylton | af68c87 | 2005-12-10 18:50:16 +0000 | [diff] [blame] | 498 | const char *f = format; |
Guido van Rossum | e537240 | 1993-03-16 12:15:04 +0000 | [diff] [blame] | 499 | int n = countformat(f, '\0'); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 500 | va_list lva; |
| 501 | |
| 502 | #ifdef VA_LIST_IS_ARRAY |
| 503 | memcpy(lva, va, sizeof(va_list)); |
| 504 | #else |
Martin v. Löwis | 75d2d94 | 2002-07-28 10:23:27 +0000 | [diff] [blame] | 505 | #ifdef __va_copy |
| 506 | __va_copy(lva, va); |
| 507 | #else |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 508 | lva = va; |
| 509 | #endif |
Martin v. Löwis | 75d2d94 | 2002-07-28 10:23:27 +0000 | [diff] [blame] | 510 | #endif |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 511 | |
Guido van Rossum | e537240 | 1993-03-16 12:15:04 +0000 | [diff] [blame] | 512 | if (n < 0) |
| 513 | return NULL; |
| 514 | if (n == 0) { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 515 | Py_INCREF(Py_None); |
| 516 | return Py_None; |
Guido van Rossum | e537240 | 1993-03-16 12:15:04 +0000 | [diff] [blame] | 517 | } |
| 518 | if (n == 1) |
Thomas Wouters | 49fd7fa | 2006-04-21 10:40:58 +0000 | [diff] [blame] | 519 | return do_mkvalue(&f, &lva, flags); |
| 520 | return do_mktuple(&f, &lva, '\0', n, flags); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 521 | } |
| 522 | |
| 523 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 524 | PyObject * |
Jeremy Hylton | af68c87 | 2005-12-10 18:50:16 +0000 | [diff] [blame] | 525 | PyEval_CallFunction(PyObject *obj, const char *format, ...) |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 526 | { |
| 527 | va_list vargs; |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 528 | PyObject *args; |
| 529 | PyObject *res; |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 530 | |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 531 | va_start(vargs, format); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 532 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 533 | args = Py_VaBuildValue(format, vargs); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 534 | va_end(vargs); |
| 535 | |
| 536 | if (args == NULL) |
| 537 | return NULL; |
| 538 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 539 | res = PyEval_CallObject(obj, args); |
| 540 | Py_DECREF(args); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 541 | |
| 542 | return res; |
| 543 | } |
| 544 | |
| 545 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 546 | PyObject * |
Jeremy Hylton | af68c87 | 2005-12-10 18:50:16 +0000 | [diff] [blame] | 547 | PyEval_CallMethod(PyObject *obj, const char *methodname, const char *format, ...) |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 548 | { |
| 549 | va_list vargs; |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 550 | PyObject *meth; |
| 551 | PyObject *args; |
| 552 | PyObject *res; |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 553 | |
Guido van Rossum | c4099e6 | 1998-08-08 20:51:26 +0000 | [diff] [blame] | 554 | meth = PyObject_GetAttrString(obj, methodname); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 555 | if (meth == NULL) |
| 556 | return NULL; |
| 557 | |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 558 | va_start(vargs, format); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 559 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 560 | args = Py_VaBuildValue(format, vargs); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 561 | va_end(vargs); |
| 562 | |
| 563 | if (args == NULL) { |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 564 | Py_DECREF(meth); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 565 | return NULL; |
| 566 | } |
| 567 | |
Guido van Rossum | 79f25d9 | 1997-04-29 20:08:16 +0000 | [diff] [blame] | 568 | res = PyEval_CallObject(meth, args); |
| 569 | Py_DECREF(meth); |
| 570 | Py_DECREF(args); |
Guido van Rossum | 1ae940a | 1995-01-02 19:04:15 +0000 | [diff] [blame] | 571 | |
| 572 | return res; |
Guido van Rossum | e537240 | 1993-03-16 12:15:04 +0000 | [diff] [blame] | 573 | } |
Fred Drake | 9e28515 | 2000-09-23 03:24:27 +0000 | [diff] [blame] | 574 | |
| 575 | int |
Jeremy Hylton | af68c87 | 2005-12-10 18:50:16 +0000 | [diff] [blame] | 576 | PyModule_AddObject(PyObject *m, const char *name, PyObject *o) |
Fred Drake | 9e28515 | 2000-09-23 03:24:27 +0000 | [diff] [blame] | 577 | { |
| 578 | PyObject *dict; |
Jeremy Hylton | c44dbc4 | 2003-06-21 21:35:25 +0000 | [diff] [blame] | 579 | if (!PyModule_Check(m)) { |
Fred Drake | 8311518 | 2002-06-17 17:16:57 +0000 | [diff] [blame] | 580 | PyErr_SetString(PyExc_TypeError, |
| 581 | "PyModule_AddObject() needs module as first arg"); |
Fred Drake | 9e28515 | 2000-09-23 03:24:27 +0000 | [diff] [blame] | 582 | return -1; |
Fred Drake | 8311518 | 2002-06-17 17:16:57 +0000 | [diff] [blame] | 583 | } |
Jeremy Hylton | c44dbc4 | 2003-06-21 21:35:25 +0000 | [diff] [blame] | 584 | if (!o) { |
Martin v. Löwis | f8d59d2 | 2003-10-24 20:05:32 +0000 | [diff] [blame] | 585 | if (!PyErr_Occurred()) |
| 586 | PyErr_SetString(PyExc_TypeError, |
| 587 | "PyModule_AddObject() needs non-NULL value"); |
Jeremy Hylton | c44dbc4 | 2003-06-21 21:35:25 +0000 | [diff] [blame] | 588 | return -1; |
| 589 | } |
| 590 | |
Fred Drake | 8311518 | 2002-06-17 17:16:57 +0000 | [diff] [blame] | 591 | dict = PyModule_GetDict(m); |
| 592 | if (dict == NULL) { |
| 593 | /* Internal error -- modules must have a dict! */ |
| 594 | PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__", |
| 595 | PyModule_GetName(m)); |
| 596 | return -1; |
| 597 | } |
| 598 | if (PyDict_SetItemString(dict, name, o)) |
| 599 | return -1; |
| 600 | Py_DECREF(o); |
| 601 | return 0; |
Fred Drake | 9e28515 | 2000-09-23 03:24:27 +0000 | [diff] [blame] | 602 | } |
| 603 | |
| 604 | int |
Jeremy Hylton | af68c87 | 2005-12-10 18:50:16 +0000 | [diff] [blame] | 605 | PyModule_AddIntConstant(PyObject *m, const char *name, long value) |
Fred Drake | 9e28515 | 2000-09-23 03:24:27 +0000 | [diff] [blame] | 606 | { |
Georg Brandl | fceab5a | 2008-01-19 20:08:23 +0000 | [diff] [blame] | 607 | PyObject *o = PyLong_FromLong(value); |
| 608 | if (!o) |
| 609 | return -1; |
| 610 | if (PyModule_AddObject(m, name, o) == 0) |
| 611 | return 0; |
| 612 | Py_DECREF(o); |
| 613 | return -1; |
Fred Drake | 9e28515 | 2000-09-23 03:24:27 +0000 | [diff] [blame] | 614 | } |
| 615 | |
| 616 | int |
Jeremy Hylton | af68c87 | 2005-12-10 18:50:16 +0000 | [diff] [blame] | 617 | PyModule_AddStringConstant(PyObject *m, const char *name, const char *value) |
Fred Drake | 9e28515 | 2000-09-23 03:24:27 +0000 | [diff] [blame] | 618 | { |
Georg Brandl | fceab5a | 2008-01-19 20:08:23 +0000 | [diff] [blame] | 619 | PyObject *o = PyUnicode_FromString(value); |
| 620 | if (!o) |
| 621 | return -1; |
| 622 | if (PyModule_AddObject(m, name, o) == 0) |
| 623 | return 0; |
| 624 | Py_DECREF(o); |
| 625 | return -1; |
Fred Drake | 9e28515 | 2000-09-23 03:24:27 +0000 | [diff] [blame] | 626 | } |