summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2016-06-20 10:10:42 (GMT)
committerStefan Krah <skrah@bytereef.org>2016-06-20 10:10:42 (GMT)
commit8113f490c5aa29dbd28af7a47cb70ca470536bed (patch)
tree5406ccbb8af0624802986f21fec38dd6ca3840bc /Lib
parentdf1d31c2cdcdd478fbff507d3b906fb93f66c49b (diff)
parent6817c59cf08ac214737d86f37e63a431385a9613 (diff)
downloadcpython-8113f490c5aa29dbd28af7a47cb70ca470536bed.zip
cpython-8113f490c5aa29dbd28af7a47cb70ca470536bed.tar.gz
cpython-8113f490c5aa29dbd28af7a47cb70ca470536bed.tar.bz2
Merge 3.5.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_decimal.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
index f56f9ad..64e1cc6 100644
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -2524,7 +2524,8 @@ class PythonAPItests(unittest.TestCase):
Decimal = self.decimal.Decimal
class MyDecimal(Decimal):
- pass
+ def __init__(self, _):
+ self.x = 'y'
self.assertTrue(issubclass(MyDecimal, Decimal))
@@ -2532,6 +2533,8 @@ class PythonAPItests(unittest.TestCase):
self.assertEqual(type(r), MyDecimal)
self.assertEqual(str(r),
'0.1000000000000000055511151231257827021181583404541015625')
+ self.assertEqual(r.x, 'y')
+
bigint = 12345678901234567890123456789
self.assertEqual(MyDecimal.from_float(bigint), MyDecimal(bigint))
self.assertTrue(MyDecimal.from_float(float('nan')).is_qnan())