Skip to content

[3.8] bpo-38979: fix ContextVar "__class_getitem__" method (GH-17497) #17507

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
miss-islington merged 1 commit into from
Dec 8, 2019
Merged

[3.8] bpo-38979: fix ContextVar "__class_getitem__" method (GH-17497) #17507

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
7 changes: 4 additions & 3 deletions Lib/test/test_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ def test_context_var_new_1(self):

self.assertNotEqual(hash(c), hash('aaa'))

def test_context_var_new_2(self):
self.assertIsNone(contextvars.ContextVar[int])

@isolated_context
def test_context_var_repr_1(self):
c = contextvars.ContextVar('a')
Expand Down Expand Up @@ -361,6 +358,10 @@ def sub(num):
tp.shutdown()
self.assertEqual(results, list(range(10)))

def test_contextvar_getitem(self):
clss = contextvars.ContextVar
self.assertEqual(clss[str], clss)


# HAMT Tests

Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2019-12-07-16-32-42.bpo-38979.q0sIHy.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Return class from ``ContextVar.__class_getitem__`` to simplify subclassing.
7 changes: 4 additions & 3 deletions Python/context.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,9 +1010,10 @@ _contextvars_ContextVar_reset(PyContextVar *self, PyObject *token)


static PyObject *
contextvar_cls_getitem(PyObject *self, PyObject *args)
contextvar_cls_getitem(PyObject *self, PyObject *arg)
{
Py_RETURN_NONE;
Py_INCREF(self);
return self;
}

static PyMemberDef PyContextVar_members[] = {
Expand All @@ -1025,7 +1026,7 @@ static PyMethodDef PyContextVar_methods[] = {
_CONTEXTVARS_CONTEXTVAR_SET_METHODDEF
_CONTEXTVARS_CONTEXTVAR_RESET_METHODDEF
{"__class_getitem__", contextvar_cls_getitem,
METH_VARARGS | METH_STATIC, NULL},
METH_O | METH_CLASS, NULL},
{NULL, NULL}
};

Expand Down