[Python-checkins] cpython (merge 3.4 -> default): Issue #22284: Merge 3.4

[stefan.krah]

http://hg.python.org/cpython/rev/5bc23c111de1
changeset:   92381:5bc23c111de1
parent:      92379:e1b1be597736
parent:      92380:2b3dbbd2bd92
user:        Stefan Krah <skrah at bytereef.org>
date:        Tue Sep 09 19:57:59 2014 +0200
summary:
  Issue #22284: Merge 3.4

files:
  Lib/decimal.py |  6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/Lib/decimal.py b/Lib/decimal.py
--- a/Lib/decimal.py
+++ b/Lib/decimal.py
@@ -116,6 +116,9 @@
     # Two major classes
     'Decimal', 'Context',
 
+    # Named tuple representation
+    'DecimalTuple',
+
     # Contexts
     'DefaultContext', 'BasicContext', 'ExtendedContext',
 
@@ -124,6 +127,9 @@
     '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',

-- 
Repository URL: http://hg.python.org/cpython