summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-06-16 07:31:33 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-06-16 07:31:33 (GMT)
commit69e3dbcb86c46408572b1541f7fa879b971c9d5f (patch)
tree43e70454bce33e6bcd0e8d406da83e058555983d
parent4a518f02e254c977f9417a6a6eff3540dcf438ef (diff)
parentb6d1f48c14b7a3bc7047138dc0bf5aadfe6be480 (diff)
downloadcpython-69e3dbcb86c46408572b1541f7fa879b971c9d5f.zip
cpython-69e3dbcb86c46408572b1541f7fa879b971c9d5f.tar.gz
cpython-69e3dbcb86c46408572b1541f7fa879b971c9d5f.tar.bz2
Merge with 3.4
-rw-r--r--Doc/library/exceptions.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
index d2c2ef4..74d6fcb 100644
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -274,9 +274,10 @@ The following exceptions are the exceptions that are usually raised.
Raised when the result of an arithmetic operation is too large to be
represented. This cannot occur for integers (which would rather raise
- :exc:`MemoryError` than give up). Because of the lack of standardization of
- floating point exception handling in C, most floating point operations also
- aren't checked.
+ :exc:`MemoryError` than give up). However, for historical reasons,
+ OverflowError is sometimes raised for integers that are outside a required
+ range. Because of the lack of standardization of floating point exception
+ handling in C, most floating point operations are not checked.
.. exception:: ReferenceError