diff options
| author | Georg Brandl <georg@python.org> | 2013-10-08 19:47:35 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-10-08 19:47:35 (GMT) |
| commit | c13d6041934729dc2995389c5accf134797c9106 (patch) | |
| tree | 61c04dc995e0c0fb4e844ee3584ae476e7a8b3de /Doc/reference | |
| parent | bc332a2415884f6c199f9b016c9dd53459c06cef (diff) | |
| parent | 0aaae26518202d8aa6a7654d62432b33b5b4b425 (diff) | |
| download | cpython-c13d6041934729dc2995389c5accf134797c9106.zip cpython-c13d6041934729dc2995389c5accf134797c9106.tar.gz cpython-c13d6041934729dc2995389c5accf134797c9106.tar.bz2 | |
merge with 3.3
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/expressions.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst index 87a6d2e..caf34f4 100644 --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -912,7 +912,7 @@ repetition is performed; a negative repetition factor yields an empty sequence. The ``/`` (division) and ``//`` (floor division) operators yield the quotient of their arguments. The numeric arguments are first converted to a common type. -Integer division yields a float, while floor division of integers results in an +Division of integers yields a float, while floor division of integers results in an integer; the result is that of mathematical division with the 'floor' function applied to the result. Division by zero raises the :exc:`ZeroDivisionError` exception. @@ -972,8 +972,8 @@ the left or right by the number of bits given by the second argument. .. index:: exception: ValueError -A right shift by *n* bits is defined as division by ``pow(2,n)``. A left shift -by *n* bits is defined as multiplication with ``pow(2,n)``. +A right shift by *n* bits is defined as floor division by ``pow(2,n)``. A left +shift by *n* bits is defined as multiplication with ``pow(2,n)``. .. note:: |