[Python-checkins] r75950 - in sandbox/trunk/decimal/decimal_in_c: decimal.py decimaltestdata/extra.decTest test_decimal.py

Thu Oct 29 13:59:53 CET 2009

Author: mark.dickinson
Date: Thu Oct 29 13:59:53 2009
New Revision: 75950
Log:
Manual merge of r75947 from py3k: always convert integer arguments of Decimal methods
Modified:
 sandbox/trunk/decimal/decimal_in_c/decimal.py
 sandbox/trunk/decimal/decimal_in_c/decimaltestdata/extra.decTest
 sandbox/trunk/decimal/decimal_in_c/test_decimal.py
Modified: sandbox/trunk/decimal/decimal_in_c/decimal.py
==============================================================================

--- sandbox/trunk/decimal/decimal_in_c/decimal.py	(original)
+++ sandbox/trunk/decimal/decimal_in_c/decimal.py	Thu Oct 29 13:59:53 2009
@@ -2846,6 +2846,8 @@
 value. Note that a total ordering is defined for all possible abstract
 representations.
 """
+ other = _convert_other(other, raiseit=True)
+
 return [Dec_0, Dec_p1, Dec_n1][self._cmp_total(other)]
 
 def compare_total_mag(self, other):
@@ -2853,6 +2855,8 @@
 
 Like compare_total, but with operand's sign ignored and assumed to be 0.
 """
+ other = _convert_other(other, raiseit=True)
+
 s = self.copy_abs()
 o = other.copy_abs()
 return s.compare_total(o)
@@ -3214,6 +3218,9 @@
 """Applies an 'and' operation between self and other's digits."""
 if context is None:
 context = getcontext()
+
+ other = _convert_other(other, raiseit=True)
+
 if not self._is_logical() or not other._is_logical():
 return context._raise_error(InvalidOperation)
 acc = deccoeff_zero
@@ -3238,6 +3245,9 @@
 """Applies an 'or' operation between self and other's digits."""
 if context is None:
 context = getcontext()
+
+ other = _convert_other(other, raiseit=True)
+
 if not self._is_logical() or not other._is_logical():
 return context._raise_error(InvalidOperation)
 acc = deccoeff_zero
@@ -3250,6 +3260,9 @@
 """Applies an 'xor' operation between self and other's digits."""
 if context is None:
 context = getcontext()
+
+ other = _convert_other(other, raiseit=True)
+
 if not self._is_logical() or not other._is_logical():
 return context._raise_error(InvalidOperation)
 acc = deccoeff_zero
@@ -3487,6 +3500,8 @@
 if context is None:
 context = getcontext()
 
+ other = _convert_other(other, raiseit=True)
+
 ans = self._check_nans(other, context)
 if ans:
 return ans
@@ -3513,6 +3528,8 @@
 if context is None:
 context = getcontext()
 
+ other = _convert_other(other, raiseit=True)
+
 ans = self._check_nans(other, context)
 if ans:
 return ans
@@ -3536,6 +3553,8 @@
 if context is None:
 context = getcontext()
 
+ other = _convert_other(other, raiseit=True)
+
 ans = self._check_nans(other, context)
 if ans:
 return ans
Modified: sandbox/trunk/decimal/decimal_in_c/decimaltestdata/extra.decTest
==============================================================================
--- sandbox/trunk/decimal/decimal_in_c/decimaltestdata/extra.decTest	(original)
+++ sandbox/trunk/decimal/decimal_in_c/decimaltestdata/extra.decTest	Thu Oct 29 13:59:53 2009
@@ -154,22 +154,6 @@
 extr1302 fma 0E123 -Inf sNaN789 -> NaN Invalid_operation
 extr1302 fma -Inf 0E-456 sNaN148 -> NaN Invalid_operation
 
--- Issue #6794: when comparing NaNs using compare_total, payloads
--- should be compared as though positive integers; not
--- lexicographically as strings.
-extr1400 comparetotal NaN123 NaN45 -> 1
-extr1401 comparetotal sNaN123 sNaN45 -> 1
-extr1402 comparetotal -NaN123 -NaN45 -> -1
-extr1403 comparetotal -sNaN123 -sNaN45 -> -1
-extr1404 comparetotal NaN45 NaN123 -> -1
-extr1405 comparetotal sNaN45 sNaN123 -> -1
-extr1406 comparetotal -NaN45 -NaN123 -> 1
-extr1407 comparetotal -sNaN45 -sNaN123 -> 1
-
-extr1410 comparetotal -sNaN63450748854172416 -sNaN911993 -> -1
-extr1411 comparetotmag NaN1222222222222 -NaN999999 -> 1
-
-
 -- max/min/max_mag/min_mag bug in 2.5.2/2.6/3.0: max(NaN, finite) gave
 -- incorrect answers when the finite number required rounding; similarly
 -- for the other thre functions
@@ -187,6 +171,50 @@
 extr1430 min_mag 9181716151 -NaN -> 9.18172E+9 Inexact Rounded
 extr1431 min_mag NaN4 1.818180E100 -> 1.81818E+100 Rounded
 
+-- Issue #6794: when comparing NaNs using compare_total, payloads
+-- should be compared as though positive integers; not
+-- lexicographically as strings.
+extr1500 comparetotal NaN123 NaN45 -> 1
+extr1501 comparetotal sNaN123 sNaN45 -> 1
+extr1502 comparetotal -NaN123 -NaN45 -> -1
+extr1503 comparetotal -sNaN123 -sNaN45 -> -1
+extr1504 comparetotal NaN45 NaN123 -> -1
+extr1505 comparetotal sNaN45 sNaN123 -> -1
+extr1506 comparetotal -NaN45 -NaN123 -> 1
+extr1507 comparetotal -sNaN45 -sNaN123 -> 1
+
+extr1510 comparetotal -sNaN63450748854172416 -sNaN911993 -> -1
+extr1511 comparetotmag NaN1222222222222 -NaN999999 -> 1
+
+-- Issue #7233: rotate and scale should truncate an argument
+-- of length greater than the current precision.
+precision: 4
+extr1600 rotate 1234567 -5 -> NaN Invalid_operation
+extr1601 rotate 1234567 -4 -> 4567
+extr1602 rotate 1234567 -3 -> 5674
+extr1603 rotate 1234567 -2 -> 6745
+extr1604 rotate 1234567 -1 -> 7456
+extr1605 rotate 1234567 0 -> 4567
+extr1606 rotate 1234567 1 -> 5674
+extr1607 rotate 1234567 2 -> 6745
+extr1608 rotate 1234567 3 -> 7456
+extr1609 rotate 1234567 4 -> 4567
+extr1610 rotate 1234567 5 -> NaN Invalid_operation
+
+extr1650 shift 1234567 -5 -> NaN Invalid_operation
+extr1651 shift 1234567 -4 -> 0
+extr1652 shift 1234567 -3 -> 4
+extr1653 shift 1234567 -2 -> 45
+extr1654 shift 1234567 -1 -> 456
+extr1655 shift 1234567 0 -> 4567
+extr1656 shift 1234567 1 -> 5670
+extr1657 shift 1234567 2 -> 6700
+extr1658 shift 1234567 3 -> 7000
+extr1659 shift 1234567 4 -> 0
+extr1660 shift 1234567 5 -> NaN Invalid_operation
+
+
+
 -- Tests for the is_* boolean operations
 precision: 9
 maxExponent: 999
Modified: sandbox/trunk/decimal/decimal_in_c/test_decimal.py
==============================================================================
--- sandbox/trunk/decimal/decimal_in_c/test_decimal.py	(original)
+++ sandbox/trunk/decimal/decimal_in_c/test_decimal.py	Thu Oct 29 13:59:53 2009
@@ -1530,6 +1530,53 @@
 self.assertEqual(str(Decimal(0).sqrt()),
 str(c.sqrt(Decimal(0))))
 
+ def test_conversions_from_int(self):
+ # Check that methods taking a second Decimal argument will
+ # always accept an integer in place of a Decimal.
+ self.assertEqual(Decimal(4).compare(3),
+ Decimal(4).compare(Decimal(3)))
+ self.assertEqual(Decimal(4).compare_signal(3),
+ Decimal(4).compare_signal(Decimal(3)))
+ self.assertEqual(Decimal(4).compare_total(3),
+ Decimal(4).compare_total(Decimal(3)))
+ self.assertEqual(Decimal(4).compare_total_mag(3),
+ Decimal(4).compare_total_mag(Decimal(3)))
+ self.assertEqual(Decimal(10101).logical_and(1001),
+ Decimal(10101).logical_and(Decimal(1001)))
+ self.assertEqual(Decimal(10101).logical_or(1001),
+ Decimal(10101).logical_or(Decimal(1001)))
+ self.assertEqual(Decimal(10101).logical_xor(1001),
+ Decimal(10101).logical_xor(Decimal(1001)))
+ self.assertEqual(Decimal(567).max(123),
+ Decimal(567).max(Decimal(123)))
+ self.assertEqual(Decimal(567).max_mag(123),
+ Decimal(567).max_mag(Decimal(123)))
+ self.assertEqual(Decimal(567).min(123),
+ Decimal(567).min(Decimal(123)))
+ self.assertEqual(Decimal(567).min_mag(123),
+ Decimal(567).min_mag(Decimal(123)))
+ self.assertEqual(Decimal(567).next_toward(123),
+ Decimal(567).next_toward(Decimal(123)))
+ self.assertEqual(Decimal(1234).quantize(100),
+ Decimal(1234).quantize(Decimal(100)))
+ self.assertEqual(Decimal(768).remainder_near(1234),
+ Decimal(768).remainder_near(Decimal(1234)))
+ self.assertEqual(Decimal(123).rotate(1),
+ Decimal(123).rotate(Decimal(1)))
+ self.assertEqual(Decimal(1234).same_quantum(1000),
+ Decimal(1234).same_quantum(Decimal(1000)))
+ self.assertEqual(Decimal('9.123').scaleb(-100),
+ Decimal('9.123').scaleb(Decimal(-100)))
+ self.assertEqual(Decimal(456).shift(-1),
+ Decimal(456).shift(Decimal(-1)))
+
+ self.assertEqual(Decimal(-12).fma(Decimal(45), 67),
+ Decimal(-12).fma(Decimal(45), Decimal(67)))
+ self.assertEqual(Decimal(-12).fma(45, 67),
+ Decimal(-12).fma(Decimal(45), Decimal(67)))
+ self.assertEqual(Decimal(-12).fma(45, Decimal(67)),
+ Decimal(-12).fma(Decimal(45), Decimal(67)))
+
 
 class DecimalPythonAPItests(unittest.TestCase):
 
