diff options
| author | Larry Hastings <larry@hastings.org> | 2010-03-25 00:54:54 +0000 |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2010-03-25 00:54:54 +0000 |
| commit | 3bcff6ed52acaac596725dde0143e343cd4b1116 (patch) | |
| tree | 40ed6cc494b7e7fe3500815384057422a38454ca /Python/compile.c | |
| parent | 9c50a5d250942586c3f002ec51685c780e11d5e4 (diff) | |
| download | cpython-3bcff6ed52acaac596725dde0143e343cd4b1116.tar.gz | |
Backported PyCapsule from 3.1, and converted most uses of
CObject to PyCapsule.
Diffstat (limited to 'Python/compile.c')
| -rw-r--r-- | Python/compile.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Python/compile.c b/Python/compile.c index 12210e1296..90cf065f9a 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -181,6 +181,8 @@ static int compiler_with(struct compiler *, stmt_ty); static PyCodeObject *assemble(struct compiler *, int addNone); static PyObject *__doc__; +#define COMPILER_CAPSULE_NAME_COMPILER_UNIT "compile.c compiler unit" + PyObject * _Py_Mangle(PyObject *privateobj, PyObject *ident) { @@ -490,13 +492,13 @@ compiler_enter_scope(struct compiler *c, identifier name, void *key, /* Push the old compiler_unit on the stack. */ if (c->u) { - PyObject *wrapper = PyCObject_FromVoidPtr(c->u, NULL); - if (!wrapper || PyList_Append(c->c_stack, wrapper) < 0) { - Py_XDECREF(wrapper); + PyObject *capsule = PyCapsule_New(c->u, COMPILER_CAPSULE_NAME_COMPILER_UNIT, NULL); + if (!capsule || PyList_Append(c->c_stack, capsule) < 0) { + Py_XDECREF(capsule); compiler_unit_free(u); return 0; } - Py_DECREF(wrapper); + Py_DECREF(capsule); u->u_private = c->u->u_private; Py_XINCREF(u->u_private); } @@ -513,15 +515,15 @@ static void compiler_exit_scope(struct compiler *c) { int n; - PyObject *wrapper; + PyObject *capsule; c->c_nestlevel--; compiler_unit_free(c->u); /* Restore c->u to the parent unit. */ n = PyList_GET_SIZE(c->c_stack) - 1; if (n >= 0) { - wrapper = PyList_GET_ITEM(c->c_stack, n); - c->u = (struct compiler_unit *)PyCObject_AsVoidPtr(wrapper); + capsule = PyList_GET_ITEM(c->c_stack, n); + c->u = (struct compiler_unit *)PyCapsule_GetPointer(capsule, COMPILER_CAPSULE_NAME_COMPILER_UNIT); assert(c->u); /* we are deleting from a list so this really shouldn't fail */ if (PySequence_DelItem(c->c_stack, n) < 0) |