bpo-34762: Fix contextvars C API to use PyObject* pointer types. (GH-9473)
diff --git a/Python/context.c b/Python/context.c
index c9658ba..7344e96 100644
--- a/Python/context.c
+++ b/Python/context.c
@@ -18,6 +18,28 @@
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=a0955718c8b8cea6]*/
+#define ENSURE_Context(o, err_ret) \
+ if (!PyContext_CheckExact(o)) { \
+ PyErr_SetString(PyExc_TypeError, \
+ "an instance of Context was expected"); \
+ return err_ret; \
+ }
+
+#define ENSURE_ContextVar(o, err_ret) \
+ if (!PyContextVar_CheckExact(o)) { \
+ PyErr_SetString(PyExc_TypeError, \
+ "an instance of ContextVar was expected"); \
+ return err_ret; \
+ }
+
+#define ENSURE_ContextToken(o, err_ret) \
+ if (!PyContextToken_CheckExact(o)) { \
+ PyErr_SetString(PyExc_TypeError, \
+ "an instance of Token was expected"); \
+ return err_ret; \
+ }
+
+
/////////////////////////// Context API
@@ -50,21 +72,23 @@
}
-PyContext *
+PyObject *
PyContext_New(void)
{
- return context_new_empty();
+ return (PyObject *)context_new_empty();
}
-PyContext *
-PyContext_Copy(PyContext * ctx)
+PyObject *
+PyContext_Copy(PyObject * octx)
{
- return context_new_from_vars(ctx->ctx_vars);
+ ENSURE_Context(octx, NULL)
+ PyContext *ctx = (PyContext *)octx;
+ return (PyObject *)context_new_from_vars(ctx->ctx_vars);
}
-PyContext *
+PyObject *
PyContext_CopyCurrent(void)
{
PyContext *ctx = context_get();
@@ -72,13 +96,16 @@
return NULL;
}
- return context_new_from_vars(ctx->ctx_vars);
+ return (PyObject *)context_new_from_vars(ctx->ctx_vars);
}
int
-PyContext_Enter(PyContext *ctx)
+PyContext_Enter(PyObject *octx)
{
+ ENSURE_Context(octx, -1)
+ PyContext *ctx = (PyContext *)octx;
+
if (ctx->ctx_entered) {
PyErr_Format(PyExc_RuntimeError,
"cannot enter context: %R is already entered", ctx);
@@ -100,8 +127,11 @@
int
-PyContext_Exit(PyContext *ctx)
+PyContext_Exit(PyObject *octx)
{
+ ENSURE_Context(octx, -1)
+ PyContext *ctx = (PyContext *)octx;
+
if (!ctx->ctx_entered) {
PyErr_Format(PyExc_RuntimeError,
"cannot exit context: %R has not been entered", ctx);
@@ -129,7 +159,7 @@
}
-PyContextVar *
+PyObject *
PyContextVar_New(const char *name, PyObject *def)
{
PyObject *pyname = PyUnicode_FromString(name);
@@ -138,14 +168,15 @@
}
PyContextVar *var = contextvar_new(pyname, def);
Py_DECREF(pyname);
- return var;
+ return (PyObject *)var;
}
int
-PyContextVar_Get(PyContextVar *var, PyObject *def, PyObject **val)
+PyContextVar_Get(PyObject *ovar, PyObject *def, PyObject **val)
{
- assert(PyContextVar_CheckExact(var));
+ ENSURE_ContextVar(ovar, -1)
+ PyContextVar *var = (PyContextVar *)ovar;
PyThreadState *ts = PyThreadState_GET();
assert(ts != NULL);
@@ -204,9 +235,12 @@
}
-PyContextToken *
-PyContextVar_Set(PyContextVar *var, PyObject *val)
+PyObject *
+PyContextVar_Set(PyObject *ovar, PyObject *val)
{
+ ENSURE_ContextVar(ovar, NULL)
+ PyContextVar *var = (PyContextVar *)ovar;
+
if (!PyContextVar_CheckExact(var)) {
PyErr_SetString(
PyExc_TypeError, "an instance of ContextVar was expected");
@@ -233,13 +267,18 @@
return NULL;
}
- return tok;
+ return (PyObject *)tok;
}
int
-PyContextVar_Reset(PyContextVar *var, PyContextToken *tok)
+PyContextVar_Reset(PyObject *ovar, PyObject *otok)
{
+ ENSURE_ContextVar(ovar, -1)
+ ENSURE_ContextToken(otok, -1)
+ PyContextVar *var = (PyContextVar *)ovar;
+ PyContextToken *tok = (PyContextToken *)otok;
+
if (tok->tok_used) {
PyErr_Format(PyExc_RuntimeError,
"%R has already been used once", tok);
@@ -376,7 +415,7 @@
PyExc_TypeError, "Context() does not accept any arguments");
return NULL;
}
- return (PyObject *)PyContext_New();
+ return PyContext_New();
}
static int
@@ -587,14 +626,14 @@
return NULL;
}
- if (PyContext_Enter(self)) {
+ if (PyContext_Enter((PyObject *)self)) {
return NULL;
}
PyObject *call_result = _PyObject_FastCallKeywords(
args[0], args + 1, nargs - 1, kwnames);
- if (PyContext_Exit(self)) {
+ if (PyContext_Exit((PyObject *)self)) {
return NULL;
}
@@ -908,7 +947,7 @@
}
PyObject *val;
- if (PyContextVar_Get(self, default_value, &val) < 0) {
+ if (PyContextVar_Get((PyObject *)self, default_value, &val) < 0) {
return NULL;
}
@@ -937,7 +976,7 @@
_contextvars_ContextVar_set(PyContextVar *self, PyObject *value)
/*[clinic end generated code: output=446ed5e820d6d60b input=c0a6887154227453]*/
{
- return (PyObject *)PyContextVar_Set(self, value);
+ return PyContextVar_Set((PyObject *)self, value);
}
/*[clinic input]
@@ -961,7 +1000,7 @@
return NULL;
}
- if (PyContextVar_Reset(self, (PyContextToken *)token)) {
+ if (PyContextVar_Reset((PyObject *)self, token)) {
return NULL;
}