summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBrandt Bucher <brandtbucher@gmail.com>2020-02-26 20:01:48 (GMT)
committerGitHub <noreply@github.com>2020-02-26 20:01:48 (GMT)
commitd0ca9bd93bb9d8d4aa9bbe939ca7fd54ac870c8f (patch)
treec58f460744dcdd401d55dc1a79f7dd875d31bfa5 /Doc
parent6aa1f1ecf7142a4117eedb8c570f30da1598616c (diff)
downloadcpython-d0ca9bd93bb9d8d4aa9bbe939ca7fd54ac870c8f.zip
cpython-d0ca9bd93bb9d8d4aa9bbe939ca7fd54ac870c8f.tar.gz
cpython-d0ca9bd93bb9d8d4aa9bbe939ca7fd54ac870c8f.tar.bz2
bpo-36144: Document PEP 584 (GH-18659)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/stdtypes.rst16
-rw-r--r--Doc/whatsnew/3.9.rst6
2 files changed, 22 insertions, 0 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 47d64f1..435ba5b 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -4392,6 +4392,22 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098:
>>> d.values() == d.values()
False
+ .. describe:: d | other
+
+ Create a new dictionary with the merged keys and values of *d* and
+ *other*, which must both be dictionaries. The values of *other* take
+ priority when *d* and *other* share keys.
+
+ .. versionadded:: 3.9
+
+ .. describe:: d |= other
+
+ Update the dictionary *d* with keys and values from *other*, which may be
+ either a :term:`mapping` or an :term:`iterable` of key/value pairs. The
+ values of *other* take priority when *d* and *other* share keys.
+
+ .. versionadded:: 3.9
+
Dictionaries compare equal if and only if they have the same ``(key,
value)`` pairs (regardless of ordering). Order comparisons ('<', '<=', '>=', '>') raise
:exc:`TypeError`.
diff --git a/Doc/whatsnew/3.9.rst b/Doc/whatsnew/3.9.rst
index d3b35fc..8ad26d6 100644
--- a/Doc/whatsnew/3.9.rst
+++ b/Doc/whatsnew/3.9.rst
@@ -70,6 +70,12 @@ Summary -- Release highlights
New Features
============
+Dictionary Merge & Update Operators
+-----------------------------------
+
+Merge (``|``) and update (``|=``) operators have been added to the built-in
+:class:`dict` class. See :pep:`584` for a full description.
+(Contributed by Brandt Bucher in :issue:`36144`.)
Other Language Changes