summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2014-09-09 19:57:59 +0200
committerStefan Krah <skrah@bytereef.org>2014-09-09 19:57:59 +0200
commit082a9b1274ae61011e97b5c7e424e0e438114123 (patch)
tree3303974bd6b69cdebecfc55dfb41b04f4714e647
parent38684c366364fcd4071534a1de62f728407224d8 (diff)
parent964feabd79633624f5865a0faac7f8f727b176ce (diff)
downloadcpython-git-082a9b1274ae61011e97b5c7e424e0e438114123.tar.gz
Issue #22284: Merge 3.4
-rw-r--r--Lib/decimal.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/Lib/decimal.py b/Lib/decimal.py
index f7d4507b0d..b6d0a3415e 100644
--- a/Lib/decimal.py
+++ b/Lib/decimal.py
@@ -116,6 +116,9 @@ __all__ = [
# Two major classes
'Decimal', 'Context',
+ # Named tuple representation
+ 'DecimalTuple',
+
# Contexts
'DefaultContext', 'BasicContext', 'ExtendedContext',
@@ -124,6 +127,9 @@ __all__ = [
'Inexact', 'Rounded', 'Subnormal', 'Overflow', 'Underflow',
'FloatOperation',
+ # Exceptional conditions that trigger InvalidOperation
+ 'DivisionImpossible', 'InvalidContext', 'ConversionSyntax', 'DivisionUndefined',
+
# Constants for use in setting up contexts
'ROUND_DOWN', 'ROUND_HALF_UP', 'ROUND_HALF_EVEN', 'ROUND_CEILING',
'ROUND_FLOOR', 'ROUND_UP', 'ROUND_HALF_DOWN', 'ROUND_05UP',