Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions Doc/library/contextvars.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ Context Variables

The name of the variable. This is a read-only property.

.. versionadded:: 3.7.1

.. method:: get([default])

Return a value for the context variable for the current context.
Expand Down
9 changes: 7 additions & 2 deletions Lib/test/test_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,13 @@ def test_context_var_new_1(self):
with self.assertRaisesRegex(TypeError, 'must be a str'):
contextvars.ContextVar(1)

c = contextvars.ContextVar('a')
self.assertNotEqual(hash(c), hash('a'))
c = contextvars.ContextVar('aaa')
self.assertEqual(c.name, 'aaa')

with self.assertRaises(AttributeError):
c.name = 'bbb'

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

def test_context_var_new_2(self):
self.assertIsNone(contextvars.ContextVar[int])
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Implement contextvars.ContextVar.name attribute.
5 changes: 5 additions & 0 deletions Python/context.c
Original file line number Diff line number Diff line change
Expand Up @@ -940,6 +940,10 @@ contextvar_cls_getitem(PyObject *self, PyObject *args)
Py_RETURN_NONE;
}

static PyMemberDef PyContextVar_members[] = {
{"name", T_OBJECT, offsetof(PyContextVar, var_name), READONLY},
{NULL}
};

static PyMethodDef PyContextVar_methods[] = {
_CONTEXTVARS_CONTEXTVAR_GET_METHODDEF
Expand All @@ -955,6 +959,7 @@ PyTypeObject PyContextVar_Type = {
"ContextVar",
sizeof(PyContextVar),
.tp_methods = PyContextVar_methods,
.tp_members = PyContextVar_members,
.tp_dealloc = (destructor)contextvar_tp_dealloc,
.tp_getattro = PyObject_GenericGetAttr,
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
Expand Down