Skip to content

[3.7] bpo-34762: Update PyContext* refs to PyObject* in asyncio and decimal#9610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1st1 merged 1 commit into from
Sep 27, 2018
Merged

[3.7] bpo-34762: Update PyContext* refs to PyObject* in asyncio and decimal #9610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions Modules/_asynciomodule.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ typedef enum{
PyObject_HEAD \
PyObject *prefix##_loop; \
PyObject *prefix##_callback0; \
PyContext *prefix##_context0; \
PyObject *prefix##_context0; \
PyObject *prefix##_callbacks; \
PyObject *prefix##_exception; \
PyObject *prefix##_result; \
Expand All@@ -78,7 +78,7 @@ typedef struct{
FutureObj_HEAD(task)
PyObject *task_fut_waiter;
PyObject *task_coro;
PyContext *task_context;
PyObject *task_context;
int task_must_cancel;
int task_log_destroy_pending;
} TaskObj;
Expand DownExpand Up@@ -337,7 +337,7 @@ get_event_loop(void)


static int
call_soon(PyObject *loop, PyObject *func, PyObject *arg, PyContext *ctx)
call_soon(PyObject *loop, PyObject *func, PyObject *arg, PyObject *ctx)
{
PyObject *handle;
PyObject *stack[3];
Expand DownExpand Up@@ -448,7 +448,7 @@ future_schedule_callbacks(FutureObj *fut)
PyObject *cb = PyTuple_GET_ITEM(cb_tup, 0);
PyObject *ctx = PyTuple_GET_ITEM(cb_tup, 1);

if (call_soon(fut->fut_loop, cb, (PyObject *)fut, (PyContext *)ctx)){
if (call_soon(fut->fut_loop, cb, (PyObject *)fut, ctx)){
/* If an error occurs in pure-Python implementation,
all callbacks are cleared. */
Py_CLEAR(fut->fut_callbacks);
Expand DownExpand Up@@ -616,7 +616,7 @@ future_get_result(FutureObj *fut, PyObject **result)
}

static PyObject *
future_add_done_callback(FutureObj *fut, PyObject *arg, PyContext *ctx)
future_add_done_callback(FutureObj *fut, PyObject *arg, PyObject *ctx)
{
if (!future_is_alive(fut)){
PyErr_SetString(PyExc_RuntimeError, "uninitialized Future object");
Expand DownExpand Up@@ -903,16 +903,15 @@ _asyncio_Future_add_done_callback_impl(FutureObj *self, PyObject *fn,
/*[clinic end generated code: output=7ce635bbc9554c1e input=15ab0693a96e9533]*/
{
if (context == NULL){
context = (PyObject *)PyContext_CopyCurrent();
context = PyContext_CopyCurrent();
if (context == NULL){
return NULL;
}
PyObject *res = future_add_done_callback(
self, fn, (PyContext *)context);
PyObject *res = future_add_done_callback(self, fn, context);
Py_DECREF(context);
return res;
}
return future_add_done_callback(self, fn, (PyContext *)context);
return future_add_done_callback(self, fn, context);
}

/*[clinic input]
Expand Down
6 changes: 3 additions & 3 deletions Modules/_decimal/_decimal.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,7 @@ incr_false(void)
}


static PyContextVar *current_context_var;
static PyObject *current_context_var;

/* Template for creating new thread contexts, calling Context() without
* arguments and initializing the module_context on first access. */
Expand DownExpand Up@@ -1500,7 +1500,7 @@ init_current_context(void)
}
CTX(tl_context)->status = 0;

PyContextToken *tok = PyContextVar_Set(current_context_var, tl_context);
PyObject *tok = PyContextVar_Set(current_context_var, tl_context);
if (tok == NULL){
Py_DECREF(tl_context);
return NULL;
Expand DownExpand Up@@ -1561,7 +1561,7 @@ PyDec_SetCurrentContext(PyObject *self UNUSED, PyObject *v)
Py_INCREF(v);
}

PyContextToken *tok = PyContextVar_Set(current_context_var, v);
PyObject *tok = PyContextVar_Set(current_context_var, v);
Py_DECREF(v);
if (tok == NULL){
return NULL;
Expand Down