merge 3.3

This commit is contained in:
Benjamin Peterson 2013-01-20 10:05:28 -05:00
commit e7ce184fe8
1 changed files with 6 additions and 6 deletions

View File

@ -600,12 +600,12 @@ This example introduces several new features.
guess when you have typed the last line). Note that each line within a basic guess when you have typed the last line). Note that each line within a basic
block must be indented by the same amount. block must be indented by the same amount.
* The :func:`print` function writes the value of the expression(s) it is * The :func:`print` function writes the value of the argument(s) it is given.
given. It differs from just writing the expression you want to write (as we did It differs from just writing the expression you want to write (as we did
earlier in the calculator examples) in the way it handles multiple earlier in the calculator examples) in the way it handles multiple arguments,
expressions, floating point quantities, floating point quantities, and strings. Strings are printed without quotes,
and strings. Strings are printed without quotes, and a space is inserted and a space is inserted between items, so you can format things nicely, like
between items, so you can format things nicely, like this:: this::
>>> i = 256*256 >>> i = 256*256
>>> print('The value of i is', i) >>> print('The value of i is', i)