summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-01-25 21:31:56 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-01-25 21:31:56 (GMT)
commita5f6d0e030e11b84e9e952f6ce688b32f232dda3 (patch)
tree70fc80b489442b5552d2452f4cc6bbdea9eeb3d7
parent9b727eca26ac97e2029dff669cf031d3ae5150c2 (diff)
parentb4b0b354dd39ad5a9e4a90625b0528c0f4e4e349 (diff)
downloadcpython-a5f6d0e030e11b84e9e952f6ce688b32f232dda3.zip
cpython-a5f6d0e030e11b84e9e952f6ce688b32f232dda3.tar.gz
cpython-a5f6d0e030e11b84e9e952f6ce688b32f232dda3.tar.bz2
merge 3.2
-rw-r--r--Doc/library/stdtypes.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 84666ee..a2ee932 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -383,12 +383,12 @@ modules.
.. _bitstring-ops:
-Bit-string Operations on Integer Types
+Bitwise Operations on Integer Types
--------------------------------------
.. index::
triple: operations on; integer; types
- pair: bit-string; operations
+ pair: bitwise; operations
pair: shifting; operations
pair: masking; operations
operator: ^
@@ -396,15 +396,15 @@ Bit-string Operations on Integer Types
operator: <<
operator: >>
-Integers support additional operations that make sense only for bit-strings.
-Negative numbers are treated as their 2's complement value (this assumes a
-sufficiently large number of bits that no overflow occurs during the operation).
+Bitwise operations only make sense for integers. Negative numbers are treated
+as their 2's complement value (this assumes a sufficiently large number of bits
+that no overflow occurs during the operation).
The priorities of the binary bitwise operations are all lower than the numeric
operations and higher than the comparisons; the unary operation ``~`` has the
same priority as the other unary numeric operations (``+`` and ``-``).
-This table lists the bit-string operations sorted in ascending priority
+This table lists the bitwise operations sorted in ascending priority
(operations in the same box have the same priority):
+------------+--------------------------------+----------+