summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMariatta <Mariatta@users.noreply.github.com>2017-05-29 22:19:31 (GMT)
committerterryjreedy <tjreedy@udel.edu>2017-05-29 22:19:31 (GMT)
commitd52f47a8f7794ee09151973a00d29c8612672e7a (patch)
tree3806f5bd2216a53edc123b233a5947d7e7078fee
parent2ee91c8ad825079cdfc0d98f3f439f3b1c8ca471 (diff)
downloadcpython-d52f47a8f7794ee09151973a00d29c8612672e7a.zip
cpython-d52f47a8f7794ee09151973a00d29c8612672e7a.tar.gz
cpython-d52f47a8f7794ee09151973a00d29c8612672e7a.tar.bz2
[3.6] bpo-30361: Use better example for mixed-type operands (GH-1701) (#1856)
(cherry picked from commit e405d4b8dfb8b497e1c3d1f0f8e28030040c165e)
-rw-r--r--Doc/tutorial/introduction.rst6
1 files changed, 2 insertions, 4 deletions
diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
index 52120a0..8956aa5 100644
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -100,10 +100,8 @@ give you an error::
There is full support for floating point; operators with mixed type operands
convert the integer operand to floating point::
- >>> 3 * 3.75 / 1.5
- 7.5
- >>> 7.0 / 2
- 3.5
+ >>> 4 * 3.75 - 1
+ 14.0
In interactive mode, the last printed expression is assigned to the variable
``_``. This means that when you are using Python as a desk calculator, it is