Mailman 3 July 2018 - Python-checkins

bpo-33833: Fix ProactorSocketTransport AssertionError (GH-7893)
by Miss Islington (bot) July 30, 2018

July 30, 2018

https://github.com/python/cpython/commit/d5c75be55504fae1ff510eed66cddbd27b… commit: d5c75be55504fae1ff510eed66cddbd27bfbdbe2 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-07-30T13:04:30-07:00 summary: bpo-33833: Fix ProactorSocketTransport AssertionError (GH-7893) (cherry picked from commit 9045199c5aaeac9b52537581be127d999b5944ee) Co-authored-by: twisteroid ambassador <… [View More]twisteroidambassador(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Library/2018-06-17-11-46-20.bpo-33833.RnEqvM.rst M Lib/asyncio/proactor_events.py M Lib/test/test_asyncio/test_proactor_events.py diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py index 6d230a2d1773..66bfb0ab11ee 100644 --- a/Lib/asyncio/proactor_events.py +++ b/Lib/asyncio/proactor_events.py @@ -343,6 +343,10 @@ def write(self, data): def _loop_writing(self, f=None, data=None): try: + if f is not None and self._write_fut is None and self._closing: + # XXX most likely self._force_close() has been called, and + # it has set self._write_fut to None. + return assert f is self._write_fut self._write_fut = None self._pending_write = 0 diff --git a/Lib/test/test_asyncio/test_proactor_events.py b/Lib/test/test_asyncio/test_proactor_events.py index 557b461750a1..56f77ad945af 100644 --- a/Lib/test/test_asyncio/test_proactor_events.py +++ b/Lib/test/test_asyncio/test_proactor_events.py @@ -253,6 +253,19 @@ def test_force_close(self): self.assertEqual(None, tr._buffer) self.assertEqual(tr._conn_lost, 1) + def test_loop_writing_force_close(self): + exc_handler = mock.Mock() + self.loop.set_exception_handler(exc_handler) + fut = asyncio.Future(loop=self.loop) + fut.set_result(1) + self.proactor.send.return_value = fut + + tr = self.socket_transport() + tr.write(b'data') + tr._force_close(None) + test_utils.run_briefly(self.loop) + exc_handler.assert_not_called() + def test_force_close_idempotent(self): tr = self.socket_transport() tr._closing = True diff --git a/Misc/NEWS.d/next/Library/2018-06-17-11-46-20.bpo-33833.RnEqvM.rst b/Misc/NEWS.d/next/Library/2018-06-17-11-46-20.bpo-33833.RnEqvM.rst new file mode 100644 index 000000000000..1a7672f27ce0 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-06-17-11-46-20.bpo-33833.RnEqvM.rst @@ -0,0 +1,2 @@ +Fixed bug in asyncio where ProactorSocketTransport logs AssertionError if +force closed during write. [View Less]

1 0

Use 'for example' instead of 'in other words' in compound statement doc (GH-8401)
by Miss Islington (bot) July 30, 2018

July 30, 2018

https://github.com/python/cpython/commit/a7bd4bb4e38e8f8fc95413366272c7b03c… commit: a7bd4bb4e38e8f8fc95413366272c7b03c03622e branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-07-30T12:47:24-07:00 summary: Use 'for example' instead of 'in other words' in compound statement doc (GH-8401) (cherry picked from commit 6921ef7bef4eab3819b3d0fda5fa3e3b2a8c0613) Co-authored-by: Andrés Delfino … [View More]

1 0

Use 'for example' instead of 'in other words' in compound statement doc (GH-8401)
by Miss Islington (bot) July 30, 2018

July 30, 2018

https://github.com/python/cpython/commit/399b47fdf6346d15579d363ddfd0661eb9… commit: 399b47fdf6346d15579d363ddfd0661eb906699e branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-07-30T12:30:31-07:00 summary: Use 'for example' instead of 'in other words' in compound statement doc (GH-8401) (cherry picked from commit 6921ef7bef4eab3819b3d0fda5fa3e3b2a8c0613) Co-authored-by: Andrés Delfino … [View More]

1 0

[2.7] Use 'for example' instead of 'in other words' in compound statement doc (GH-8401)
by Mariatta July 30, 2018

July 30, 2018

https://github.com/python/cpython/commit/5e980f09b624b98bc1202cdabaaa0809c8… commit: 5e980f09b624b98bc1202cdabaaa0809c8b6437e branch: 2.7 author: Andrés Delfino <adelfino(a)gmail.com> committer: Mariatta <Mariatta(a)users.noreply.github.com> date: 2018-07-30T12:16:35-07:00 summary: [2.7] Use 'for example' instead of 'in other words' in compound statement doc (GH-8401) (cherry picked from commit 6921ef7bef4eab3819b3d0fda5fa3e3b2a8c0613) Co-authored-by: Andrés Delfino <adelfino(… [View More]

1 0

bpo-33833: Fix ProactorSocketTransport AssertionError (#7893)
by Andrew Svetlov July 30, 2018

July 30, 2018

https://github.com/python/cpython/commit/9045199c5aaeac9b52537581be127d999b… commit: 9045199c5aaeac9b52537581be127d999b5944ee branch: master author: twisteroid ambassador <twisteroidambassador(a)users.noreply.github.com> committer: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: 2018-07-30T21:58:50+03:00 summary: bpo-33833: Fix ProactorSocketTransport AssertionError (#7893) files: A Misc/NEWS.d/next/Library/2018-06-17-11-46-20.bpo-33833.RnEqvM.rst M Lib/asyncio/proactor_events.… [View More]py M Lib/test/test_asyncio/test_proactor_events.py diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py index 6d230a2d1773..66bfb0ab11ee 100644 --- a/Lib/asyncio/proactor_events.py +++ b/Lib/asyncio/proactor_events.py @@ -343,6 +343,10 @@ def write(self, data): def _loop_writing(self, f=None, data=None): try: + if f is not None and self._write_fut is None and self._closing: + # XXX most likely self._force_close() has been called, and + # it has set self._write_fut to None. + return assert f is self._write_fut self._write_fut = None self._pending_write = 0 diff --git a/Lib/test/test_asyncio/test_proactor_events.py b/Lib/test/test_asyncio/test_proactor_events.py index ac529413c275..dddbe3b2a107 100644 --- a/Lib/test/test_asyncio/test_proactor_events.py +++ b/Lib/test/test_asyncio/test_proactor_events.py @@ -257,6 +257,19 @@ def test_force_close(self): self.assertEqual(None, tr._buffer) self.assertEqual(tr._conn_lost, 1) + def test_loop_writing_force_close(self): + exc_handler = mock.Mock() + self.loop.set_exception_handler(exc_handler) + fut = asyncio.Future(loop=self.loop) + fut.set_result(1) + self.proactor.send.return_value = fut + + tr = self.socket_transport() + tr.write(b'data') + tr._force_close(None) + test_utils.run_briefly(self.loop) + exc_handler.assert_not_called() + def test_force_close_idempotent(self): tr = self.socket_transport() tr._closing = True diff --git a/Misc/NEWS.d/next/Library/2018-06-17-11-46-20.bpo-33833.RnEqvM.rst b/Misc/NEWS.d/next/Library/2018-06-17-11-46-20.bpo-33833.RnEqvM.rst new file mode 100644 index 000000000000..1a7672f27ce0 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-06-17-11-46-20.bpo-33833.RnEqvM.rst @@ -0,0 +1,2 @@ +Fixed bug in asyncio where ProactorSocketTransport logs AssertionError if +force closed during write. [View Less]

1 0

Use 'for example' instead of 'in other words' in compound statement doc (GH-8401)
by Mariatta July 30, 2018

July 30, 2018

https://github.com/python/cpython/commit/6921ef7bef4eab3819b3d0fda5fa3e3b2a… commit: 6921ef7bef4eab3819b3d0fda5fa3e3b2a8c0613 branch: master author: Andrés Delfino <adelfino(a)gmail.com> committer: Mariatta <Mariatta(a)users.noreply.github.com> date: 2018-07-30T11:44:35-07:00 summary: Use 'for example' instead of 'in other words' in compound statement doc (GH-8401) files: M Doc/reference/compound_stmts.rst diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/… [View More]

1 0

Fix typos & formatting in Using Python on Windows doc (GH-8559)
by Miss Islington (bot) July 30, 2018

July 30, 2018

https://github.com/python/cpython/commit/a0605182042c64762a4b8c9f3eccc3f0e3… commit: a0605182042c64762a4b8c9f3eccc3f0e300ae8c branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-07-30T11:09:22-07:00 summary: Fix typos & formatting in Using Python on Windows doc (GH-8559) (cherry picked from commit 8e7e8bd8984068e3245d64b9a21e6840880747af) Co-authored-by: Segev Finer <segev208(a)… [View More]gmail.com> files: M Doc/using/windows.rst diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index 5cbf13f51081..eb278a5e5eb4 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -147,7 +147,7 @@ of available options is shown below. | | ``.pyc``. | | +---------------------------+--------------------------------------+--------------------------+ | PrependPath | Add install and Scripts directories | 0 | -| | tho :envvar:`PATH` and ``.PY`` to | | +| | to :envvar:`PATH` and ``.PY`` to | | | | :envvar:`PATHEXT` | | +---------------------------+--------------------------------------+--------------------------+ | Shortcuts | Create shortcuts for the interpreter,| 1 | @@ -210,7 +210,7 @@ The options listed above can also be provided in a file named ``unattend.xml`` alongside the executable. This file specifies a list of options and values. When a value is provided as an attribute, it will be converted to a number if possible. Values provided as element text are always left as strings. This -example file sets the same options and the previous example: +example file sets the same options as the previous example: .. code-block:: xml @@ -610,7 +610,7 @@ Customization via INI files Two .ini files will be searched by the launcher - ``py.ini`` in the current user's "application data" directory (i.e. the directory returned by calling the -Windows function SHGetFolderPath with CSIDL_LOCAL_APPDATA) and ``py.ini`` in the +Windows function ``SHGetFolderPath`` with ``CSIDL_LOCAL_APPDATA``) and ``py.ini`` in the same directory as the launcher. The same .ini files are used for both the 'console' version of the launcher (i.e. py.exe) and for the 'windows' version (i.e. pyw.exe) @@ -816,7 +816,7 @@ following advice will prevent conflicts with other installations: These will ensure that the files in a system-wide installation will not take precedence over the copy of the standard library bundled with your application. Otherwise, your users may experience problems using your application. Note that -the first suggestion is the best, as the other may still be susceptible to +the first suggestion is the best, as the others may still be susceptible to non-standard paths in the registry and user site-packages. .. versionchanged:: [View Less]

1 0

Fix typos & formatting in Using Python on Windows doc (GH-8559)
by Miss Islington (bot) July 30, 2018

July 30, 2018

https://github.com/python/cpython/commit/15bbae7f5062bffe14e008502619ddc3da… commit: 15bbae7f5062bffe14e008502619ddc3dad74693 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-07-30T10:20:31-07:00 summary: Fix typos & formatting in Using Python on Windows doc (GH-8559) (cherry picked from commit 8e7e8bd8984068e3245d64b9a21e6840880747af) Co-authored-by: Segev Finer <segev208(a)… [View More]gmail.com> files: M Doc/using/windows.rst diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index c6624fe446b0..a4294686fafe 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -147,7 +147,7 @@ of available options is shown below. | | ``.pyc``. | | +---------------------------+--------------------------------------+--------------------------+ | PrependPath | Add install and Scripts directories | 0 | -| | tho :envvar:`PATH` and ``.PY`` to | | +| | to :envvar:`PATH` and ``.PY`` to | | | | :envvar:`PATHEXT` | | +---------------------------+--------------------------------------+--------------------------+ | Shortcuts | Create shortcuts for the interpreter,| 1 | @@ -210,7 +210,7 @@ The options listed above can also be provided in a file named ``unattend.xml`` alongside the executable. This file specifies a list of options and values. When a value is provided as an attribute, it will be converted to a number if possible. Values provided as element text are always left as strings. This -example file sets the same options and the previous example: +example file sets the same options as the previous example: .. code-block:: xml @@ -610,7 +610,7 @@ Customization via INI files Two .ini files will be searched by the launcher - ``py.ini`` in the current user's "application data" directory (i.e. the directory returned by calling the -Windows function SHGetFolderPath with CSIDL_LOCAL_APPDATA) and ``py.ini`` in the +Windows function ``SHGetFolderPath`` with ``CSIDL_LOCAL_APPDATA``) and ``py.ini`` in the same directory as the launcher. The same .ini files are used for both the 'console' version of the launcher (i.e. py.exe) and for the 'windows' version (i.e. pyw.exe) @@ -816,7 +816,7 @@ following advice will prevent conflicts with other installations: These will ensure that the files in a system-wide installation will not take precedence over the copy of the standard library bundled with your application. Otherwise, your users may experience problems using your application. Note that -the first suggestion is the best, as the other may still be susceptible to +the first suggestion is the best, as the others may still be susceptible to non-standard paths in the registry and user site-packages. .. versionchanged:: [View Less]

1 0

Fix typos & formatting in Using Python on Windows doc (GH-8559)
by Mariatta July 30, 2018

July 30, 2018

https://github.com/python/cpython/commit/8e7e8bd8984068e3245d64b9a21e684088… commit: 8e7e8bd8984068e3245d64b9a21e6840880747af branch: master author: Segev Finer <segev208(a)gmail.com> committer: Mariatta <Mariatta(a)users.noreply.github.com> date: 2018-07-30T10:11:30-07:00 summary: Fix typos & formatting in Using Python on Windows doc (GH-8559) files: M Doc/using/windows.rst diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index 5cbf13f51081..eb278a5e5eb4 100644 --- … [View More]a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -147,7 +147,7 @@ of available options is shown below. | | ``.pyc``. | | +---------------------------+--------------------------------------+--------------------------+ | PrependPath | Add install and Scripts directories | 0 | -| | tho :envvar:`PATH` and ``.PY`` to | | +| | to :envvar:`PATH` and ``.PY`` to | | | | :envvar:`PATHEXT` | | +---------------------------+--------------------------------------+--------------------------+ | Shortcuts | Create shortcuts for the interpreter,| 1 | @@ -210,7 +210,7 @@ The options listed above can also be provided in a file named ``unattend.xml`` alongside the executable. This file specifies a list of options and values. When a value is provided as an attribute, it will be converted to a number if possible. Values provided as element text are always left as strings. This -example file sets the same options and the previous example: +example file sets the same options as the previous example: .. code-block:: xml @@ -610,7 +610,7 @@ Customization via INI files Two .ini files will be searched by the launcher - ``py.ini`` in the current user's "application data" directory (i.e. the directory returned by calling the -Windows function SHGetFolderPath with CSIDL_LOCAL_APPDATA) and ``py.ini`` in the +Windows function ``SHGetFolderPath`` with ``CSIDL_LOCAL_APPDATA``) and ``py.ini`` in the same directory as the launcher. The same .ini files are used for both the 'console' version of the launcher (i.e. py.exe) and for the 'windows' version (i.e. pyw.exe) @@ -816,7 +816,7 @@ following advice will prevent conflicts with other installations: These will ensure that the files in a system-wide installation will not take precedence over the copy of the standard library bundled with your application. Otherwise, your users may experience problems using your application. Note that -the first suggestion is the best, as the other may still be susceptible to +the first suggestion is the best, as the others may still be susceptible to non-standard paths in the registry and user site-packages. .. versionchanged:: [View Less]

1 0

Add docstrings to public methods from context.c (GH-8531)
by Yury Selivanov July 30, 2018

July 30, 2018

https://github.com/python/cpython/commit/20678fd8740de31e5b078a470a0f7629b0… commit: 20678fd8740de31e5b078a470a0f7629b0994f51 branch: master author: Peter Lamut <plamut(a)users.noreply.github.com> committer: Yury Selivanov <yury(a)magic.io> date: 2018-07-30T16:15:44+01:00 summary: Add docstrings to public methods from context.c (GH-8531) files: M Misc/ACKS M Python/clinic/context.c.h M Python/context.c diff --git a/Misc/ACKS b/Misc/ACKS index 0b0bb3a763db..0cb73a00308d 100644 --- … [View More]a/Misc/ACKS +++ b/Misc/ACKS @@ -888,6 +888,7 @@ Loïc Lajeanne David Lam Thomas Lamb Valerie Lambert +Peter Lamut Jean-Baptiste "Jiba" Lamy Ronan Lamy Peter Landry diff --git a/Python/clinic/context.c.h b/Python/clinic/context.c.h index dcf4c214e1bd..683b9d7902f7 100644 --- a/Python/clinic/context.c.h +++ b/Python/clinic/context.c.h @@ -5,7 +5,11 @@ preserve PyDoc_STRVAR(_contextvars_Context_get__doc__, "get($self, key, default=None, /)\n" "--\n" -"\n"); +"\n" +"Return the value for `key` if `key` has the value in the context object.\n" +"\n" +"If `key` does not exist, return `default`. If `default` is not given,\n" +"return None."); #define _CONTEXTVARS_CONTEXT_GET_METHODDEF \ {"get", (PyCFunction)_contextvars_Context_get, METH_FASTCALL, _contextvars_Context_get__doc__}, @@ -35,7 +39,10 @@ _contextvars_Context_get(PyContext *self, PyObject *const *args, Py_ssize_t narg PyDoc_STRVAR(_contextvars_Context_items__doc__, "items($self, /)\n" "--\n" -"\n"); +"\n" +"Return all variables and their values in the context object.\n" +"\n" +"The result is returned as a list of 2-tuples (variable, value)."); #define _CONTEXTVARS_CONTEXT_ITEMS_METHODDEF \ {"items", (PyCFunction)_contextvars_Context_items, METH_NOARGS, _contextvars_Context_items__doc__}, @@ -52,7 +59,8 @@ _contextvars_Context_items(PyContext *self, PyObject *Py_UNUSED(ignored)) PyDoc_STRVAR(_contextvars_Context_keys__doc__, "keys($self, /)\n" "--\n" -"\n"); +"\n" +"Return a list of all variables in the context object."); #define _CONTEXTVARS_CONTEXT_KEYS_METHODDEF \ {"keys", (PyCFunction)_contextvars_Context_keys, METH_NOARGS, _contextvars_Context_keys__doc__}, @@ -69,7 +77,8 @@ _contextvars_Context_keys(PyContext *self, PyObject *Py_UNUSED(ignored)) PyDoc_STRVAR(_contextvars_Context_values__doc__, "values($self, /)\n" "--\n" -"\n"); +"\n" +"Return a list of all variables’ values in the context object."); #define _CONTEXTVARS_CONTEXT_VALUES_METHODDEF \ {"values", (PyCFunction)_contextvars_Context_values, METH_NOARGS, _contextvars_Context_values__doc__}, @@ -86,7 +95,8 @@ _contextvars_Context_values(PyContext *self, PyObject *Py_UNUSED(ignored)) PyDoc_STRVAR(_contextvars_Context_copy__doc__, "copy($self, /)\n" "--\n" -"\n"); +"\n" +"Return a shallow copy of the context object."); #define _CONTEXTVARS_CONTEXT_COPY_METHODDEF \ {"copy", (PyCFunction)_contextvars_Context_copy, METH_NOARGS, _contextvars_Context_copy__doc__}, @@ -103,7 +113,14 @@ _contextvars_Context_copy(PyContext *self, PyObject *Py_UNUSED(ignored)) PyDoc_STRVAR(_contextvars_ContextVar_get__doc__, "get($self, default=None, /)\n" "--\n" -"\n"); +"\n" +"Return a value for the context variable for the current context.\n" +"\n" +"If there is no value for the variable in the current context, the method will:\n" +" * return the value of the default argument of the method, if provided; or\n" +" * return the default value for the context variable, if it was created\n" +" with one; or\n" +" * raise a LookupError."); #define _CONTEXTVARS_CONTEXTVAR_GET_METHODDEF \ {"get", (PyCFunction)_contextvars_ContextVar_get, METH_FASTCALL, _contextvars_ContextVar_get__doc__}, @@ -131,7 +148,13 @@ _contextvars_ContextVar_get(PyContextVar *self, PyObject *const *args, Py_ssize_ PyDoc_STRVAR(_contextvars_ContextVar_set__doc__, "set($self, value, /)\n" "--\n" -"\n"); +"\n" +"Call to set a new value for the context variable in the current context.\n" +"\n" +"The required value argument is the new value for the context variable.\n" +"\n" +"Returns a Token object that can be used to restore the variable to its previous\n" +"value via the `ContextVar.reset()` method."); #define _CONTEXTVARS_CONTEXTVAR_SET_METHODDEF \ {"set", (PyCFunction)_contextvars_ContextVar_set, METH_O, _contextvars_ContextVar_set__doc__}, @@ -139,8 +162,12 @@ PyDoc_STRVAR(_contextvars_ContextVar_set__doc__, PyDoc_STRVAR(_contextvars_ContextVar_reset__doc__, "reset($self, token, /)\n" "--\n" -"\n"); +"\n" +"Reset the context variable.\n" +"\n" +"The variable is reset to the value it had before the `ContextVar.set()` that\n" +"created the token was used."); #define _CONTEXTVARS_CONTEXTVAR_RESET_METHODDEF \ {"reset", (PyCFunction)_contextvars_ContextVar_reset, METH_O, _contextvars_ContextVar_reset__doc__}, -/*[clinic end generated code: output=d9a675e3a52a14fc input=a9049054013a1b77]*/ +/*[clinic end generated code: output=33414d13716d0648 input=a9049054013a1b77]*/ diff --git a/Python/context.c b/Python/context.c index 8ee048ccdd5c..c9658bae33c2 100644 --- a/Python/context.c +++ b/Python/context.c @@ -489,12 +489,17 @@ _contextvars.Context.get key: object default: object = None / + +Return the value for `key` if `key` has the value in the context object. + +If `key` does not exist, return `default`. If `default` is not given, +return None. [clinic start generated code]*/ static PyObject * _contextvars_Context_get_impl(PyContext *self, PyObject *key, PyObject *default_value) -/*[clinic end generated code: output=0c54aa7664268189 input=8d4c33c8ecd6d769]*/ +/*[clinic end generated code: output=0c54aa7664268189 input=c8eeb81505023995]*/ { if (context_check_key_type(key)) { return NULL; @@ -516,11 +521,15 @@ _contextvars_Context_get_impl(PyContext *self, PyObject *key, /*[clinic input] _contextvars.Context.items + +Return all variables and their values in the context object. + +The result is returned as a list of 2-tuples (variable, value). [clinic start generated code]*/ static PyObject * _contextvars_Context_items_impl(PyContext *self) -/*[clinic end generated code: output=fa1655c8a08502af input=2d570d1455004979]*/ +/*[clinic end generated code: output=fa1655c8a08502af input=00db64ae379f9f42]*/ { return _PyHamt_NewIterItems(self->ctx_vars); } @@ -528,11 +537,13 @@ _contextvars_Context_items_impl(PyContext *self) /*[clinic input] _contextvars.Context.keys + +Return a list of all variables in the context object. [clinic start generated code]*/ static PyObject * _contextvars_Context_keys_impl(PyContext *self) -/*[clinic end generated code: output=177227c6b63ec0e2 input=13005e142fbbf37d]*/ +/*[clinic end generated code: output=177227c6b63ec0e2 input=114b53aebca3449c]*/ { return _PyHamt_NewIterKeys(self->ctx_vars); } @@ -540,11 +551,13 @@ _contextvars_Context_keys_impl(PyContext *self) /*[clinic input] _contextvars.Context.values + +Return a list of all variables’ values in the context object. [clinic start generated code]*/ static PyObject * _contextvars_Context_values_impl(PyContext *self) -/*[clinic end generated code: output=d286dabfc8db6dde input=c2cbc40a4470e905]*/ +/*[clinic end generated code: output=d286dabfc8db6dde input=6c3d08639ba3bf67]*/ { return _PyHamt_NewIterValues(self->ctx_vars); } @@ -552,11 +565,13 @@ _contextvars_Context_values_impl(PyContext *self) /*[clinic input] _contextvars.Context.copy + +Return a shallow copy of the context object. [clinic start generated code]*/ static PyObject * _contextvars_Context_copy_impl(PyContext *self) -/*[clinic end generated code: output=30ba8896c4707a15 input=3e3fd72d598653ab]*/ +/*[clinic end generated code: output=30ba8896c4707a15 input=ebafdbdd9c72d592]*/ { return (PyObject *)context_new_from_vars(self->ctx_vars); } @@ -872,11 +887,19 @@ contextvar_tp_repr(PyContextVar *self) _contextvars.ContextVar.get default: object = NULL / + +Return a value for the context variable for the current context. + +If there is no value for the variable in the current context, the method will: + * return the value of the default argument of the method, if provided; or + * return the default value for the context variable, if it was created + with one; or + * raise a LookupError. [clinic start generated code]*/ static PyObject * _contextvars_ContextVar_get_impl(PyContextVar *self, PyObject *default_value) -/*[clinic end generated code: output=0746bd0aa2ced7bf input=8d002b02eebbb247]*/ +/*[clinic end generated code: output=0746bd0aa2ced7bf input=30aa2ab9e433e401]*/ { if (!PyContextVar_CheckExact(self)) { PyErr_SetString( @@ -901,11 +924,18 @@ _contextvars_ContextVar_get_impl(PyContextVar *self, PyObject *default_value) _contextvars.ContextVar.set value: object / + +Call to set a new value for the context variable in the current context. + +The required value argument is the new value for the context variable. + +Returns a Token object that can be used to restore the variable to its previous +value via the `ContextVar.reset()` method. [clinic start generated code]*/ static PyObject * _contextvars_ContextVar_set(PyContextVar *self, PyObject *value) -/*[clinic end generated code: output=446ed5e820d6d60b input=a2d88f57c6d86f7c]*/ +/*[clinic end generated code: output=446ed5e820d6d60b input=c0a6887154227453]*/ { return (PyObject *)PyContextVar_Set(self, value); } @@ -914,11 +944,16 @@ _contextvars_ContextVar_set(PyContextVar *self, PyObject *value) _contextvars.ContextVar.reset token: object / + +Reset the context variable. + +The variable is reset to the value it had before the `ContextVar.set()` that +created the token was used. [clinic start generated code]*/ static PyObject * _contextvars_ContextVar_reset(PyContextVar *self, PyObject *token) -/*[clinic end generated code: output=d4ee34d0742d62ee input=4c871b6f1f31a65f]*/ +/*[clinic end generated code: output=d4ee34d0742d62ee input=ebe2881e5af4ffda]*/ { if (!PyContextToken_CheckExact(token)) { PyErr_Format(PyExc_TypeError, [View Less]

1 0