Skip to content

bpo-32436: Implement PEP 567 #5027

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 24 commits into from
Jan 23, 2018
+6,269 −120
Merged

bpo-32436: Implement PEP 567 #5027

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8192f9a
bpo-32436: Implement PEP 567
Dec 28, 2017
8d0d64c
Add Token.MISSING, token.old_val; token.var
Dec 28, 2017
d846b41
Make PyContextVar_Get return a new ref
Dec 28, 2017
339c283
Explain HAMT
Dec 28, 2017
243175f
Mention how to debug HAMT
Dec 30, 2017
63c38fe
Address review feedback
Jan 15, 2018
c4750a7
ThreadState now refs to a Context object (fixes Context.run/__getitem__)
Jan 15, 2018
b1c97f0
Document hamt_t enum types
Jan 16, 2018
4f10c5e
Add a test
Jan 16, 2018
47d5a99
Add Context.copy() method
Jan 16, 2018
7549c6a
Harden PyContext_Exit to check that the current context matches
Jan 16, 2018
db384f3
Simplify context_new() logic
Jan 16, 2018
e299b4c
Token.reset() checks the context too now
Jan 16, 2018
dad0651
Token.old_val -> Token.old_value
Jan 16, 2018
78b0361
Test that subclassing is prohibited
Jan 17, 2018
3673bd9
Make ContextVar.reset raise an error for already used tokens
Jan 17, 2018
9223883
Drop unused file
Jan 17, 2018
8c82581
Reword a comment
Jan 17, 2018
17fa9c0
Address Inada-sun comments
Jan 18, 2018
52dc25b
Cache empty HAMT node
Jan 19, 2018
81ae871
Don't GC-track ContextVars if name/default are not tracked
Jan 19, 2018
7070cca
Handle an error if rehashing fails
Jan 19, 2018
cc8873c
PyContext_CopyCurrent() & PyContext_Copy() (sync with the PEP)
Jan 21, 2018
e353e95
Fix asynciomodule.c to use new PyContext_CopyCurrent
Jan 22, 2018
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
Prev Previous commit
Next Next commit
Token.reset() checks the context too now
  • Loading branch information
Yury Selivanov
Yury Selivanov committed Jan 22, 2018
commit e299b4c3e224e0c687e2f4cfc56e0cff62811e95
1 change: 1 addition & 0 deletions Include/internal/context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ struct _pycontextvarobject {

struct _pycontexttokenobject {
PyObject_HEAD
PyContext *tok_ctx;
PyContextVar *tok_var;
PyObject *tok_oldval;
int tok_used;
Expand Down
10 changes: 10 additions & 0 deletions Lib/test/test_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,16 @@ def fun():

ctx.run(fun)

@isolated_context
def test_context_getset_4(self):
c = contextvars.ContextVar('c', default=42)
ctx = contextvars.Context()

tok = ctx.run(c.set, 1)

with self.assertRaisesRegex(ValueError, 'different Context'):
c.reset(tok)

def test_context_copy_1(self):
ctx1 = contextvars.Context()
c = contextvars.ContextVar('c', default=42)
Expand Down
18 changes: 15 additions & 3 deletions Python/context.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ static inline PyContext *
context_copy(void);

static PyContextToken *
token_new(PyContextVar *var, PyObject *val);
token_new(PyContext *ctx, PyContextVar *var, PyObject *val);

static PyContextVar *
contextvar_new(PyObject *name, PyObject *def);
Expand Down Expand Up @@ -211,7 +211,7 @@ PyContextVar_Set(PyContextVar *var, PyObject *val)
}

Py_XINCREF(old_val);
PyContextToken *tok = token_new(var, old_val);
PyContextToken *tok = token_new(ctx, var, old_val);
Py_XDECREF(old_val);

if (contextvar_set(var, val)) {
Expand All @@ -232,6 +232,13 @@ PyContextVar_Reset(PyContextVar *var, PyContextToken *tok)
return -1;
}

PyContext *ctx = context_get();
if (ctx != tok->tok_ctx) {
PyErr_SetString(PyExc_ValueError,
"Token was created in a different Context");
return -1;
}

if (tok->tok_used) {
return 0;
}
Expand Down Expand Up @@ -971,6 +978,7 @@ token_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
static int
token_tp_clear(PyContextToken *self)
{
Py_CLEAR(self->tok_ctx);
Py_CLEAR(self->tok_var);
Py_CLEAR(self->tok_oldval);
return 0;
Expand All @@ -979,6 +987,7 @@ token_tp_clear(PyContextToken *self)
static int
token_tp_traverse(PyContextToken *self, visitproc visit, void *arg)
{
Py_VISIT(self->tok_ctx);
Py_VISIT(self->tok_var);
Py_VISIT(self->tok_oldval);
return 0;
Expand Down Expand Up @@ -1032,13 +1041,16 @@ PyTypeObject PyContextToken_Type = {
};

static PyContextToken *
token_new(PyContextVar *var, PyObject *val)
token_new(PyContext *ctx, PyContextVar *var, PyObject *val)
{
PyContextToken *tok = PyObject_GC_New(PyContextToken, &PyContextToken_Type);
if (tok == NULL) {
return NULL;
}

Py_INCREF(ctx);
tok->tok_ctx = ctx;

Py_INCREF(var);
tok->tok_var = var;

Expand Down