Skip to content

bpo-38979: fix ContextVar "__class_getitem__" method #17497

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 7 commits into from
Dec 8, 2019
Merged

bpo-38979: fix ContextVar "__class_getitem__" method #17497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5364ad5
bpo-38979: return class from __class_getitem__ to simplify subclassing
amiremohamadi Dec 7, 2019
50b93ae
add ContextVar.__class_getitem__ test
amiremohamadi Dec 7, 2019
26ab478
add ContextVar.__class_getitem__ NEWS
amiremohamadi Dec 7, 2019
53fe505
revert to previous commit
amiremohamadi Dec 7, 2019
7003848
remove example
amiremohamadi Dec 7, 2019
d27d71c
remove test_context_var_new_2
amiremohamadi Dec 7, 2019
938b77c
Update 2019-12-07-16-32-42.bpo-38979.q0sIHy.rst
asvetlov Dec 8, 2019
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
Comment thread
amiremohamadi marked this conversation as resolved.
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