[Python-checkins] cpython (merge 3.2 -> 3.3): #16677: merge with 3.2.
ezio.melotti
python-checkins at python.org
Tue Dec 25 14:48:01 CET 2012
http://hg.python.org/cpython/rev/356af3fc6471
changeset: 81037:356af3fc6471
branch: 3.3
parent: 81029:dbe9413686b3
parent: 81036:2eab4f7b7280
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Tue Dec 25 15:46:58 2012 +0200
summary:
#16677: merge with 3.2.
files:
Doc/reference/expressions.rst | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -1303,8 +1303,8 @@
.. _operator-summary:
-Summary
-=======
+Operator precedence
+===================
.. index:: pair: operator; precedence
@@ -1328,9 +1328,9 @@
+-----------------------------------------------+-------------------------------------+
| :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 @@
+-----------------------------------------------+-------------------------------------+
| ``(expressions...)``, | Binding or tuple display, |
| ``[expressions...]``, | list display, |
-| ``{key:datum...}``, | dictionary display, |
+| ``{key: value...}``, | dictionary display, |
| ``{expressions...}`` | set display |
+-----------------------------------------------+-------------------------------------+
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list