https://github.com/python/cpython/commit/f37ac53cd31b37b7d48c526785406a1b3a96f5a9
commit: f37ac53cd31b37b7d48c526785406a1b3a96f5a9
branch: 3.13
author: Miss Islington (bot) <31488909+miss-isling...@users.noreply.github.com>
committer: AA-Turner <9087854+aa-tur...@users.noreply.github.com>
date: 2024-10-29T23:27:33Z
summary:
[3.13] gh-116938: Fix `dict.update` docstring and remove erraneous full stop
from `dict` documentation (GH-125421) (#126150)
gh-116938: Fix `dict.update` docstring and remove erraneous full stop from
`dict` documentation (GH-125421)
(cherry picked from commit 5527c4051c0b58218ce69044f92b45f1d66ed43f)
Co-authored-by: Prometheus3375
<35541026+prometheus3...@users.noreply.github.com>
Co-authored-by: Adam Turner <9087854+aa-tur...@users.noreply.github.com>
files:
M Doc/library/stdtypes.rst
M Objects/dictobject.c
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index c77399461edc38..b5ba8060cb45a1 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -4635,7 +4635,7 @@ can be used interchangeably to index the same dictionary
entry.
:meth:`update` accepts either another object with a ``keys()`` method (in
which case :meth:`~object.__getitem__` is called with every key returned
from
- the method). or an iterable of key/value pairs (as tuples or other
iterables
+ the method) or an iterable of key/value pairs (as tuples or other
iterables
of length two). If keyword arguments are specified, the dictionary is
then
updated with those key/value pairs: ``d.update(red=1, blue=2)``.
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 91bc24b49a1bd8..fccc8e930f51d6 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -4625,8 +4625,8 @@ PyDoc_STRVAR(getitem__doc__,
"__getitem__($self, key, /)\n--\n\nReturn self[key].");
PyDoc_STRVAR(update__doc__,
-"D.update([E, ]**F) -> None. Update D from dict/iterable E and F.\n\
-If E is present and has a .keys() method, then does: for k in E: D[k] =
E[k]\n\
+"D.update([E, ]**F) -> None. Update D from mapping/iterable E and F.\n\
+If E is present and has a .keys() method, then does: for k in E.keys(): D[k]
= E[k]\n\
If E is present and lacks a .keys() method, then does: for k, v in E: D[k] =
v\n\
In either case, this is followed by: for k in F: D[k] = F[k]");
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
