summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-12-25 13:47:41 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-12-25 13:47:41 (GMT)
commit16bdd4120d8452e8e04b124bcdd116608c5166b0 (patch)
tree72db0071d9b0ad2e4f17f0a771c6c2c0de470195 /Doc
parent3ba3a3ee56c142e93d6bbe20ff6bf939212a30f0 (diff)
parent1be057673a1c27f717f883a2c3cdaff6c3cfb9f6 (diff)
downloadcpython-16bdd4120d8452e8e04b124bcdd116608c5166b0.zip
cpython-16bdd4120d8452e8e04b124bcdd116608c5166b0.tar.gz
cpython-16bdd4120d8452e8e04b124bcdd116608c5166b0.tar.bz2
#16677: merge with 3.3.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/reference/expressions.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
index 429fee4..e9bf5c5 100644
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -1303,8 +1303,8 @@ their suffixes::
.. _operator-summary:
-Summary
-=======
+Operator precedence
+===================
.. index:: pair: operator; precedence
@@ -1328,9 +1328,9 @@ groups from right to left).
+-----------------------------------------------+-------------------------------------+
| :keyword:`and` | Boolean AND |
+-----------------------------------------------+-------------------------------------+
-| :keyword:`not` *x* | Boolean NOT |
+| :keyword:`not` ``x`` | Boolean NOT |
+-----------------------------------------------+-------------------------------------+
-| :keyword:`in`, :keyword:`not` :keyword:`in`, | Comparisons, including membership |
+| :keyword:`in`, :keyword:`not in`, | Comparisons, including membership |
| :keyword:`is`, :keyword:`is not`, ``<``, | tests and identity tests, |
| ``<=``, ``>``, ``>=``, ``!=``, ``==`` | |
+-----------------------------------------------+-------------------------------------+
@@ -1356,7 +1356,7 @@ groups from right to left).
+-----------------------------------------------+-------------------------------------+
| ``(expressions...)``, | Binding or tuple display, |
| ``[expressions...]``, | list display, |
-| ``{key:datum...}``, | dictionary display, |
+| ``{key: value...}``, | dictionary display, |
| ``{expressions...}`` | set display |
+-----------------------------------------------+-------------------------------------+