Mailman 3 June 2004 - Python-checkins

python/dist/src/Lib/distutils/tests test_install.py, NONE, 1.1
by fdrake＠users.sourceforge.net June 25, 2004

June 25, 2004

Update of /cvsroot/python/python/dist/src/Lib/distutils/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18122/Lib/distutils/tests Added Files: test_install.py Log Message: Make distutils "install --home" support all platforms. --- NEW FILE: test_install.py --- """Tests for distutils.command.install.""" import os import unittest from distutils.command.install import install from distutils.core import Distribution from distutils.tests import support class InstallTestCase(support.TempdirManager, unittest.TestCase): def test_home_installation_scheme(self): # This ensure two things: # - that --home generates the desired set of directory names # - test --home is supported on all platforms builddir = self.mkdtemp() destination = os.path.join(builddir, "installation") dist = Distribution({"name": "foopkg"}) # script_name need not exist, it just need to be initialized dist.script_name = os.path.join(builddir, "setup.py") dist.command_obj["build"] = support.DummyCommand( build_base=builddir, build_lib=os.path.join(builddir, "lib"), ) cmd = install(dist) cmd.home = destination cmd.ensure_finalized() self.assertEqual(cmd.install_base, destination) self.assertEqual(cmd.install_platbase, destination) def check_path(got, expected): got = os.path.normpath(got) expected = os.path.normpath(expected) self.assertEqual(got, expected) libdir = os.path.join(destination, "lib", "python") check_path(cmd.install_lib, libdir) check_path(cmd.install_platlib, libdir) check_path(cmd.install_purelib, libdir) check_path(cmd.install_headers, os.path.join(destination, "include", "python", "foopkg")) check_path(cmd.install_scripts, os.path.join(destination, "bin")) check_path(cmd.install_data, destination) def test_suite(): return unittest.makeSuite(InstallTestCase) if __name__ == "__main__": unittest.main(defaultTest="test_suite")

1 0

python/dist/src/Objects typeobject.c,2.260,2.261
by rhettinger＠users.sourceforge.net June 25, 2004

June 25, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11852 Modified Files: typeobject.c Log Message: Cosmetic spacing fix. Index: typeobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v retrieving revision 2.260 retrieving revision 2.261 diff -C2 -d -r2.260 -r2.261 *** typeobject.c 25 Jun 2004 22:17:39 -0000 2.260 --- typeobject.c 25 Jun 2004 22:24:35 -0000 2.261 *************** *** 3955,3959 **** if (func == NULL) return -1; ! if(PyDict_SetItemString(type->tp_dict, "__new__", func)) { Py_DECREF(func); return -1; --- 3955,3959 ---- if (func == NULL) return -1; ! if (PyDict_SetItemString(type->tp_dict, "__new__", func)) { Py_DECREF(func); return -1;

1 0

python/dist/src/Misc ACKS,1.267,1.268
by rhettinger＠users.sourceforge.net June 25, 2004

June 25, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10828 Modified Files: ACKS Log Message: Fix leak found by Eric Huss. Index: ACKS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/ACKS,v retrieving revision 1.267 retrieving revision 1.268 diff -C2 -d -r1.267 -r1.268 *** ACKS 20 Jun 2004 22:41:32 -0000 1.267 --- ACKS 25 Jun 2004 22:20:33 -0000 1.268 *************** *** 273,276 **** --- 273,277 ---- Jim Hugunin Greg Humphreys + Eric Huss Jeremy Hylton Mihai Ibanescu

1 0

python/dist/src/Objects typeobject.c, 2.241.6.10, 2.241.6.11
by rhettinger＠users.sourceforge.net June 25, 2004

June 25, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10348 Modified Files: Tag: release23-maint typeobject.c Log Message: Fix leak found by Eric Huss. Index: typeobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v retrieving revision 2.241.6.10 retrieving revision 2.241.6.11 diff -C2 -d -r2.241.6.10 -r2.241.6.11 *** typeobject.c 11 Jun 2004 15:09:41 -0000 2.241.6.10 --- typeobject.c 25 Jun 2004 22:18:46 -0000 2.241.6.11 *************** *** 3914,3918 **** if (func == NULL) return -1; ! return PyDict_SetItemString(type->tp_dict, "__new__", func); } --- 3914,3923 ---- if (func == NULL) return -1; ! if(PyDict_SetItemString(type->tp_dict, "__new__", func)) { ! Py_DECREF(func); ! return -1; ! } ! Py_DECREF(func); ! return 0; }

1 0

python/dist/src/Objects typeobject.c,2.259,2.260
by rhettinger＠users.sourceforge.net June 25, 2004

June 25, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10121 Modified Files: typeobject.c Log Message: Fix leak found by Eric Huss. Index: typeobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v retrieving revision 2.259 retrieving revision 2.260 diff -C2 -d -r2.259 -r2.260 *** typeobject.c 11 Jun 2004 14:41:17 -0000 2.259 --- typeobject.c 25 Jun 2004 22:17:39 -0000 2.260 *************** *** 3955,3959 **** if (func == NULL) return -1; ! return PyDict_SetItemString(type->tp_dict, "__new__", func); } --- 3955,3964 ---- if (func == NULL) return -1; ! if(PyDict_SetItemString(type->tp_dict, "__new__", func)) { ! Py_DECREF(func); ! return -1; ! } ! Py_DECREF(func); ! return 0; }

1 0

python/dist/src/Lib/distutils/tests test_build_py.py, 1.1, 1.2 test_build_scripts.py, 1.1, 1.2 test_install_scripts.py, 1.3, 1.4
by fdrake＠users.sourceforge.net June 25, 2004

June 25, 2004

Update of /cvsroot/python/python/dist/src/Lib/distutils/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1190 Modified Files: test_build_py.py test_build_scripts.py test_install_scripts.py Log Message: add boilerplate so the test modules can be run as scripts Index: test_build_py.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/tests/test_build_py.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test_build_py.py 17 Jun 2004 20:16:19 -0000 1.1 --- test_build_py.py 25 Jun 2004 19:04:20 -0000 1.2 *************** *** 49,50 **** --- 49,53 ---- def test_suite(): return unittest.makeSuite(BuildPyTestCase) + + if __name__ == "__main__": + unittest.main(defaultTest="test_suite") Index: test_build_scripts.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/tests/test_build_scripts.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test_build_scripts.py 21 Jun 2004 16:15:22 -0000 1.1 --- test_build_scripts.py 25 Jun 2004 19:04:21 -0000 1.2 *************** *** 73,74 **** --- 73,77 ---- def test_suite(): return unittest.makeSuite(BuildScriptsTestCase) + + if __name__ == "__main__": + unittest.main(defaultTest="test_suite") Index: test_install_scripts.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/tests/test_install_scripts.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** test_install_scripts.py 17 Jun 2004 20:14:50 -0000 1.3 --- test_install_scripts.py 25 Jun 2004 19:04:21 -0000 1.4 *************** *** 71,75 **** - def test_suite(): return unittest.makeSuite(InstallScriptsTestCase) --- 71,77 ---- def test_suite(): return unittest.makeSuite(InstallScriptsTestCase) + + if __name__ == "__main__": + unittest.main(defaultTest="test_suite")

1 0

python/nondist/sandbox/decimal Decimal.py, 1.23, 1.24
by rhettinger＠users.sourceforge.net June 25, 2004

June 25, 2004

Update of /cvsroot/python/python/nondist/sandbox/decimal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16613 Modified Files: Decimal.py Log Message: Touchup isinfinity() and isnan(). Index: Decimal.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/decimal/Decimal.py,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Decimal.py 25 Jun 2004 06:17:02 -0000 1.23 --- Decimal.py 25 Jun 2004 17:46:20 -0000 1.24 *************** *** 99,103 **** # 0.8.1 2004.06.23 Complies with immutability-near as discussed in c.l.py. # 0.8.0 2004.06.21 Using the updated Spec (and complies with new test cases) from ! # Cowlishaw. Deprecated trim and rescale. Changed __str__ and # __repr__ to return in sci format, added as_tuple(). Fixed the # initial examples. Extracted lt, gt and eq methods from context. --- 99,103 ---- # 0.8.1 2004.06.23 Complies with immutability-near as discussed in c.l.py. # 0.8.0 2004.06.21 Using the updated Spec (and complies with new test cases) from ! # Cowlishaw. Deprecated trim and rescale. Changed __str__ and # __repr__ to return in sci format, added as_tuple(). Fixed the # initial examples. Extracted lt, gt and eq methods from context. *************** *** 466,470 **** if not isinstance(digit, (int,long)) or digit < 0: raise ValueError, "The second value in the tuple must be composed of non negative integer elements." ! self._sign = value[0] self._int = tuple(value[1]) --- 466,470 ---- if not isinstance(digit, (int,long)) or digit < 0: raise ValueError, "The second value in the tuple must be composed of non negative integer elements." ! self._sign = value[0] self._int = tuple(value[1]) *************** *** 521,525 **** real_decimal_positions = positions + int_positions d = d._round(real_decimal_positions, ROUND_HALF_UP) ! return d from_float = classmethod(from_float) --- 521,525 ---- real_decimal_positions = positions + int_positions d = d._round(real_decimal_positions, ROUND_HALF_UP) ! return d from_float = classmethod(from_float) *************** *** 741,745 **** #exp is closest mult. of 3 >= self._exp exp = ((self._exp - 1)// 3 + 1) * 3 ! if exp != self._exp: s = '0.'+'0'*(exp - self._exp) else: --- 741,745 ---- #exp is closest mult. of 3 >= self._exp exp = ((self._exp - 1)// 3 + 1) * 3 ! if exp != self._exp: s = '0.'+'0'*(exp - self._exp) else: *************** *** 955,959 **** result.int = resultint = map(operator.add, op1.int, op2.int) carry = 0 ! for i in xrange(len(op1.int)): tmp = resultint[i] + carry carry = 0 --- 955,959 ---- result.int = resultint = map(operator.add, op1.int, op2.int) carry = 0 ! for i in xrange(len(op1.int)): tmp = resultint[i] + carry carry = 0 *************** *** 963,967 **** resultint[i] = tmp if carry: ! resultint.append(1) else: result.int = resultint = map(operator.sub, op1.int, op2.int) --- 963,967 ---- resultint[i] = tmp if carry: ! resultint.append(1) else: result.int = resultint = map(operator.sub, op1.int, op2.int) *************** *** 975,979 **** resultint[i] = tmp assert not loan ! while resultint[-1] == 0: resultint.pop() --- 975,979 ---- resultint[i] = tmp assert not loan ! while resultint[-1] == 0: resultint.pop() *************** *** 1733,1737 **** if not modulo and n > 0 and (self._exp + len(self._int) - 1) * n > context.Emax \ and self: ! tmp = Decimal('inf') tmp._sign = sign --- 1733,1737 ---- if not modulo and n > 0 and (self._exp + len(self._int) - 1) * n > context.Emax \ and self: ! tmp = Decimal('inf') tmp._sign = sign *************** *** 1838,1842 **** return self._isinfinity() and other._isinfinity() and True return self._exp == other._exp ! def _rescale(self, exp, rounding = None, context=None, watchexp = 1): """Rescales so that the exponent is exp. --- 1838,1842 ---- return self._isinfinity() and other._isinfinity() and True return self._exp == other._exp ! def _rescale(self, exp, rounding = None, context=None, watchexp = 1): """Rescales so that the exponent is exp. *************** *** 1873,1877 **** if watchexp and digits > context.prec: return context._raise_error(InvalidOperation, 'Rescale > prec') ! tmp = Decimal(self) tmp._int = (0,)+tmp._int --- 1873,1877 ---- if watchexp and digits > context.prec: return context._raise_error(InvalidOperation, 'Rescale > prec') ! tmp = Decimal(self) tmp._int = (0,)+tmp._int *************** *** 1968,1972 **** Emax, Emin = context.Emax, context.Emin context.Emax, context.Emin = DEFAULT_MAX_EXPONENT, DEFAULT_MIN_EXPONENT ! half = Decimal('0.5') --- 1968,1972 ---- Emax, Emin = context.Emax, context.Emin context.Emax, context.Emin = DEFAULT_MAX_EXPONENT, DEFAULT_MIN_EXPONENT ! half = Decimal('0.5') *************** *** 2109,2113 **** int = property(_get_int) exp = property(_get_exp) ! # get rounding method function: --- 2109,2113 ---- int = property(_get_int) exp = property(_get_exp) ! # get rounding method function: *************** *** 2558,2574 **** SetDefaultContext(DEFAULT_CONTEXT) def isinfinity(num): ! """Determines whether a string or float is infinity.""" ! try: ! if isinstance(num, float): ! num = str(num) ! num = num.lower() ! if num in ['inf', 'infinity', '+inf', '+infinity']: ! return 1 ! if num in ['-inf', '-infinity']: ! return -1 ! except AttributeError: ! pass ! return 0 def isnan(num): --- 2558,2577 ---- SetDefaultContext(DEFAULT_CONTEXT) + _infinity_map = { + 'inf' : 1, + 'infinity' : 1, + '+inf' : 1, + '+infinity' : 1, + '-inf' : -1, + '-infinity' : -1 + } + def isinfinity(num): ! """Determines whether a string or float is infinity. ! ! +1 for positive infinity; 0 for finite ; +1 for positive infinity ! """ ! num = str(num).lower() ! return _infinity_map.get(num, 0) def isnan(num): *************** *** 2579,2591 **** 0 => not a NaN """ ! if isinstance(num, float): ! num = str(num) ! if len(num) == 0: return 0 ! num = num.lower() ! #get the sign, get rid of trailing [+-] sign = 0 ! if num[0] == '+': num = num[1:] elif num[0] == '-': #elif avoids '+-nan' --- 2582,2592 ---- 0 => not a NaN """ ! num = str(num).lower() ! if not num: return 0 ! #get the sign, get rid of trailing [+-] sign = 0 ! if num[0] == '+': num = num[1:] elif num[0] == '-': #elif avoids '+-nan'

1 0

python/nondist/sandbox/decimal Decimal.py, 1.22, 1.23
by rhettinger＠users.sourceforge.net June 25, 2004

June 25, 2004

Update of /cvsroot/python/python/nondist/sandbox/decimal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29145 Modified Files: Decimal.py Log Message: Touchups (round 1): * Normalize whitespace * Fixup broken doctest in the module docstring * Add a more informative error message for Decimal(3.14) * Document from_float as a class method * Rework the addition logic for speed/clarity * Simplify and speedup zero checks Index: Decimal.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/decimal/Decimal.py,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Decimal.py 25 Jun 2004 01:29:29 -0000 1.22 --- Decimal.py 25 Jun 2004 06:17:02 -0000 1.23 *************** *** 26,30 **** Decimal("1") >>> Decimal("-.0123") ! Decimal("-.0123") >>> Decimal(123456) Decimal("123456") --- 26,30 ---- Decimal("1") >>> Decimal("-.0123") ! Decimal("-0.0123") >>> Decimal(123456) Decimal("123456") *************** *** 133,137 **** import copy import math ! from operator import xor #Capitals: 1E+10, not 1e10 --- 133,138 ---- import copy import math ! import operator ! xor = operator.xor #Capitals: 1E+10, not 1e10 *************** *** 490,497 **** return raise TypeError("Can't convert %r" % value) def from_float(cls, value, positions=None): ! """Static function that creates Decimal from float value must be float --- 491,502 ---- return + if isinstance(value, float): + raise TypeError("Can't convert " + repr(value) + + ". Try Decimal.from_float() instead.") + raise TypeError("Can't convert %r" % value) def from_float(cls, value, positions=None): ! """Class method that creates Decimal from float value must be float *************** *** 605,612 **** if isinstance(self._exp, str): return 1 ! for digit in self._int: ! if digit != 0: ! return 1 ! return 0 def __cmp__(self, other, context=None): --- 610,614 ---- if isinstance(self._exp, str): return 1 ! return self._int != (0,)*len(self._int) def __cmp__(self, other, context=None): *************** *** 947,971 **** #Now, op1 > abs(op2) > 0 - carry, loan = 0, 0 op1.int.reverse() op2.int.reverse() ! result.int = [0]*len(op1.int) ! for i in range(len(op1.int)): ! tmp = op1.int[i] + (op2.sign * op2.int[i]) + carry - loan ! carry, loan = (0, 0) ! if tmp > 9: ! carry = 1 ! tmp = tmp - 10 ! if tmp < 0: ! loan = 1 ! tmp = tmp + 10 ! result.int[i] = tmp ! if carry: ! result.int.append(1) ! if loan: ! raise "What are we doing here?" ! while result.int[-1] == 0: ! result.int.pop() ! result.int.reverse() result.exp = op1.exp ans = Decimal(result) --- 949,983 ---- #Now, op1 > abs(op2) > 0 op1.int.reverse() op2.int.reverse() ! ! if op2.sign == 1: ! result.int = resultint = map(operator.add, op1.int, op2.int) ! carry = 0 ! for i in xrange(len(op1.int)): ! tmp = resultint[i] + carry ! carry = 0 ! if tmp > 9: ! carry = 1 ! tmp -= 10 ! resultint[i] = tmp ! if carry: ! resultint.append(1) ! else: ! result.int = resultint = map(operator.sub, op1.int, op2.int) ! loan = 0 ! for i in xrange(len(op1.int)): ! tmp = resultint[i] - loan ! loan = 0 ! if tmp < 0: ! loan = 1 ! tmp += 10 ! resultint[i] = tmp ! assert not loan ! ! while resultint[-1] == 0: ! resultint.pop() ! resultint.reverse() ! result.exp = op1.exp ans = Decimal(result) *************** *** 1573,1582 **** #OK, but maybe all the lost digits are 0. ! all0 = 1 ! for digit in self._int[expdiff:]: ! if digit != 0: ! all0 = 0 ! break ! if all0: ans = Decimal( (temp._sign, temp._int[:prec], temp._exp - expdiff)) #Rounded, but not Inexact --- 1585,1590 ---- #OK, but maybe all the lost digits are 0. ! lostdigits = self._int[expdiff:] ! if lostdigits == (0,) * len(lostdigits): ans = Decimal( (temp._sign, temp._int[:prec], temp._exp - expdiff)) #Rounded, but not Inexact

1 0

python/nondist/sandbox/decimal test_Decimal.py, 1.18, 1.19
by facundobatista＠users.sourceforge.net June 25, 2004

June 25, 2004

Update of /cvsroot/python/python/nondist/sandbox/decimal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10573 Modified Files: test_Decimal.py Log Message: Tests to check near-immutable Decimal. Index: test_Decimal.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/decimal/test_Decimal.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** test_Decimal.py 21 Jun 2004 21:52:52 -0000 1.18 --- test_Decimal.py 25 Jun 2004 01:30:49 -0000 1.19 *************** *** 15,18 **** --- 15,19 ---- """ + # 0.2.1 2004.06.23 fb: Added immutability test for operations. # 0.2.0 2004.06.21 fb: Using the new test cases from Cowlishaw. Deprecated trim # test case and use of result in inexact test case. Added *************** *** 1190,1220 **** self.assertEqual(d.as_tuple(), (0, (0,), 'F') ) ! ## ! ## As is impossible to make a real immutable instance in Python, ! ## I'm delaying this feature to some future. Facundo Batista 19-Jun-2004 ! ## ! ## def test_immutability(self): ! ## '''Try to change internal objects and see if immutable.''' ! ## ! ## d = Decimal(42) ! ## ! ## #the used attributes ! ## try: ! ## d._exp = 20 ! ## d._int = 3 ! ## d._sign = 1 ! ## except AttributeError: ! ## pass ! ## else: ! ## self.fail('Did not raised an error!') ! ## ! ## #some new attribute ! ## try: ! ## d.newone = None ! ## except AttributeError: ! ## pass ! ## else: ! ## self.fail('Did not raised an error!') ! ## --- 1191,1292 ---- self.assertEqual(d.as_tuple(), (0, (0,), 'F') ) ! def test_immutability_onpurpose(self): ! '''Try to change internal objects and see if immutable.''' ! ! d = Decimal(42) ! ! #you can get the attributes... ! d.exp ! d.int ! d.sign ! ! #...but not change them! ! try: ! d.exp = 20 ! d.int = 3 ! d.sign = 1 ! except AttributeError: ! pass ! else: ! self.fail('Did not raised an error!') ! ! #some new attribute ! try: ! d.newone = None ! except AttributeError: ! pass ! else: ! self.fail('Did not raised an error!') ! ! def test_immutability_operations(self): ! '''Do operations and check that it didn't change change internal objects.''' ! ! d1 = Decimal('-25e55') ! b1 = Decimal('-25e55') ! d2 = Decimal('33e-33') ! b2 = Decimal('33e-33') ! ! def checkSameDec(operation, useOther=False): ! if useOther: ! eval("d1." + operation + "(d2)") ! self.assertEqual(d1._sign, b1._sign) ! self.assertEqual(d1._int, b1._int) ! self.assertEqual(d1._exp, b1._exp) ! self.assertEqual(d2._sign, b2._sign) ! self.assertEqual(d2._int, b2._int) ! self.assertEqual(d2._exp, b2._exp) ! else: ! eval("d1." + operation + "()") ! self.assertEqual(d1._sign, b1._sign) ! self.assertEqual(d1._int, b1._int) ! self.assertEqual(d1._exp, b1._exp) ! return ! ! Decimal(d1) ! self.assertEqual(d1._sign, b1._sign) ! self.assertEqual(d1._int, b1._int) ! self.assertEqual(d1._exp, b1._exp) ! ! checkSameDec("__abs__") ! checkSameDec("__add__", True) ! checkSameDec("__div__", True) ! checkSameDec("__divmod__", True) ! checkSameDec("__cmp__", True) ! checkSameDec("__float__") ! checkSameDec("__floordiv__", True) ! checkSameDec("__hash__") ! checkSameDec("__int__") ! checkSameDec("__long__") ! checkSameDec("__mod__", True) ! checkSameDec("__mul__", True) ! checkSameDec("__neg__") ! checkSameDec("__nonzero__") ! checkSameDec("__pos__") ! checkSameDec("__pow__", True) ! checkSameDec("__radd__", True) ! checkSameDec("__rdiv__", True) ! checkSameDec("__rdivmod__", True) ! checkSameDec("__repr__") ! checkSameDec("__rfloordiv__", True) ! checkSameDec("__rmod__", True) ! checkSameDec("__rmul__", True) ! checkSameDec("__rpow__", True) ! checkSameDec("__rsub__", True) ! checkSameDec("__str__") ! checkSameDec("__sub__", True) ! checkSameDec("__truediv__", True) ! checkSameDec("adjusted") ! checkSameDec("as_tuple") ! checkSameDec("compare", True) ! checkSameDec("max", True) ! checkSameDec("min", True) ! checkSameDec("normalize") ! checkSameDec("quantize", True) ! checkSameDec("remainder_near", True) ! checkSameDec("same_quantum", True) ! checkSameDec("sqrt") ! checkSameDec("to_eng_string") ! checkSameDec("to_integral") !

1 0

python/nondist/sandbox/decimal Decimal.py, 1.21, 1.22
by facundobatista＠users.sourceforge.net June 25, 2004

June 25, 2004

Update of /cvsroot/python/python/nondist/sandbox/decimal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10118 Modified Files: Decimal.py Log Message: Made near immutable. Lot of clean-ups. Index: Decimal.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/decimal/Decimal.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Decimal.py 21 Jun 2004 21:50:51 -0000 1.21 --- Decimal.py 25 Jun 2004 01:29:29 -0000 1.22 *************** *** 96,99 **** --- 96,101 ---- # facundobatista: + # 0.8.2 2004.06.24 Lot of small clean-ups from Raymond Hettinger. + # 0.8.1 2004.06.23 Complies with immutability-near as discussed in c.l.py. # 0.8.0 2004.06.21 Using the updated Spec (and complies with new test cases) from # Cowlishaw. Deprecated trim and rescale. Changed __str__ and *************** *** 131,135 **** import copy import math - import time from operator import xor --- 133,136 ---- *************** *** 351,360 **** return Infsign[sign] if sign == 0: ! if context.rounding in (ROUND_CEILING,): return Infsign[sign] return Decimal((sign, (9,)*context.prec, context.Emax-context.prec+1)) if sign == 1: ! if context.rounding in (ROUND_FLOOR,): return Infsign[sign] return Decimal( (sign, (9,)*context.prec, --- 352,361 ---- return Infsign[sign] if sign == 0: ! if context.rounding == ROUND_CEILING: return Infsign[sign] return Decimal((sign, (9,)*context.prec, context.Emax-context.prec+1)) if sign == 1: ! if context.rounding == ROUND_FLOOR: return Infsign[sign] return Decimal( (sign, (9,)*context.prec, *************** *** 441,445 **** self._exp = 'N' #sNaN self._sign = sign ! self._int = tuple(map(int, tuple(diag))) #Diagnostic info return self._convertString(value, context) --- 442,446 ---- self._exp = 'N' #sNaN self._sign = sign ! self._int = tuple(map(int, diag)) #Diagnostic info return self._convertString(value, context) *************** *** 489,493 **** return ! raise TypeError("Can't convert " + `value`) def from_float(cls, value, positions=None): --- 490,494 ---- return ! raise TypeError("Can't convert %r" % value) def from_float(cls, value, positions=None): *************** *** 818,822 **** else: sign = 1 ! if context._rounding_decision in (ALWAYS_ROUND,): return Decimal((sign, self._int, self._exp))._fix(context=context) return Decimal( (sign, self._int, self._exp)) --- 819,823 ---- else: sign = 1 ! if context._rounding_decision == ALWAYS_ROUND: return Decimal((sign, self._int, self._exp))._fix(context=context) return Decimal( (sign, self._int, self._exp)) *************** *** 838,842 **** sign = 0 ! if context._rounding_decision in (ALWAYS_ROUND,): ans = self._fix(context=context) else: --- 839,843 ---- sign = 0 ! if context._rounding_decision == ALWAYS_ROUND: ans = self._fix(context=context) else: *************** *** 888,892 **** return Decimal(other) #Can't both be infinity here ! shouldround = context._rounding_decision in (ALWAYS_ROUND,) exp = min(self._exp, other._exp) --- 889,893 ---- return Decimal(other) #Can't both be infinity here ! shouldround = context._rounding_decision == ALWAYS_ROUND exp = min(self._exp, other._exp) *************** *** 1030,1034 **** ans = Decimal((self._sign, L, self._exp)) ! if round and context._rounding_decision in (ALWAYS_ROUND,): ans = ans._fix(context=context) return ans --- 1031,1035 ---- ans = Decimal((self._sign, L, self._exp)) ! if round and context._rounding_decision == ALWAYS_ROUND: ans = ans._fix(context=context) return ans *************** *** 1059,1063 **** resultexp = self._exp + other._exp ! shouldround = context._rounding_decision in (ALWAYS_ROUND,) # Special case for multiplying by zero --- 1060,1064 ---- resultexp = self._exp + other._exp ! shouldround = context._rounding_decision == ALWAYS_ROUND # Special case for multiplying by zero *************** *** 1090,1099 **** accumulator = [0]*(len(self._int) + len(other._int)) ! for i in range(len(op2)): if op2[i] == 0: continue mult = op2[i] carry = 0 ! for j in range(len(op1)): carry, accumulator[i+j] = divmod( mult * op1[j] + carry + accumulator[i+j], 10) --- 1091,1100 ---- accumulator = [0]*(len(self._int) + len(other._int)) ! for i in xrange(len(op2)): if op2[i] == 0: continue mult = op2[i] carry = 0 ! for j in xrange(len(op1)): carry, accumulator[i+j] = divmod( mult * op1[j] + carry + accumulator[i+j], 10) *************** *** 1196,1200 **** #OK, so neither = 0, INF ! shouldround = context._rounding_decision in (ALWAYS_ROUND,) #If we're dividing into ints, and self < other, stop. --- 1197,1201 ---- #OK, so neither = 0, INF ! shouldround = context._rounding_decision == ALWAYS_ROUND #If we're dividing into ints, and self < other, stop. *************** *** 1748,1752 **** mul = Decimal(1).__div__(mul, context=context) ! shouldround = context._rounding_decision in (ALWAYS_ROUND,) spot = 1 --- 1749,1753 ---- mul = Decimal(1).__div__(mul, context=context) ! shouldround = context._rounding_decision == ALWAYS_ROUND spot = 1 *************** *** 1825,1835 **** """ if self._isnan() or other._isnan(): ! if self._isnan() and other._isnan(): ! return True ! return False if self._isinfinity() or other._isinfinity(): ! if self._isinfinity() and other._isinfinity(): ! return True ! return False return self._exp == other._exp --- 1826,1832 ---- """ if self._isnan() or other._isnan(): ! return self._isnan() and other._isnan() and True if self._isinfinity() or other._isinfinity(): ! return self._isinfinity() and other._isinfinity() and True return self._exp == other._exp *************** *** 2044,2048 **** if self < other: ans = other ! shouldround = context._rounding_decision in (ALWAYS_ROUND,) if shouldround: ans = ans._fix(context=context) --- 2041,2045 ---- if self < other: ans = other ! shouldround = context._rounding_decision == ALWAYS_ROUND if shouldround: ans = ans._fix(context=context) *************** *** 2068,2072 **** ans = other ! if context._rounding_decision in (ALWAYS_ROUND,): ans = ans._fix(context=context) --- 2065,2069 ---- ans = other ! if context._rounding_decision == ALWAYS_ROUND: ans = ans._fix(context=context) *************** *** 2078,2084 **** return True rest = self._int[self._exp:] ! if rest == (0,)*len(rest): ! return True ! return False def _iseven(self): --- 2075,2079 ---- return True rest = self._int[self._exp:] ! return rest == (0,)*len(rest) def _iseven(self): *************** *** 2096,2099 **** --- 2091,2105 ---- return 0 + #properties to immutability-near feature + def _get_sign(self): + return self._sign + def _get_int(self): + return self._int + def _get_exp(self): + return self._exp + sign = property(_get_sign) + int = property(_get_int) + exp = property(_get_exp) + # get rounding method function: *************** *** 2309,2313 **** def __repr__(self): ! return "(" + `self.sign` + ", " + `self.int` + ", " + `self.exp` + ")" __str__ = __repr__ --- 2315,2319 ---- def __repr__(self): ! return "(%r, %r, %r)" % (self.sign, self.int, self.exp) __str__ = __repr__ *************** *** 2327,2332 **** def __cmp__(self, other): if self.exp != other.exp: ! raise ValueError("Operands not normalized: " + `self` + ! ", " + `other`) if self.sign != other.sign: if self.sign == -1: --- 2333,2337 ---- def __cmp__(self, other): if self.exp != other.exp: ! raise ValueError("Operands not normalized: %r, %r" % (self, other)) if self.sign != other.sign: if self.sign == -1: *************** *** 2344,2348 **** if len(int1) < len(int2): return direction * -1 ! for i in range(len(int1)): if int1[i] > int2[i]: return direction * 1 --- 2349,2353 ---- if len(int1) < len(int2): return direction * -1 ! for i in xrange(len(int1)): if int1[i] > int2[i]: return direction * 1 *************** *** 2374,2378 **** carry = 0 ! for x in range(len(list)): self.int[x] -= list[x] + carry if self.int[x] < 0: --- 2379,2383 ---- carry = 0 ! for x in xrange(len(list)): self.int[x] -= list[x] + carry if self.int[x] < 0: *************** *** 2631,2635 **** m = _parser(s) if m is None: ! raise ValueError("Can't parse as number: " + `s`) if m.group('sign') == "-": --- 2636,2640 ---- m = _parser(s) if m is None: ! raise ValueError("Can't parse as number: %r" % s) if m.group('sign') == "-": *************** *** 2653,2663 **** fracpart = "" ! nfrac = len(fracpart) ! exp = exp - nfrac mantissa = intpart + fracpart ! tmp = [] ! for digit in mantissa: ! tmp.append(int(digit)) backup = tmp while tmp and tmp[0] == 0: --- 2658,2665 ---- fracpart = "" ! exp -= len(fracpart) mantissa = intpart + fracpart ! tmp = map(int, mantissa) backup = tmp while tmp and tmp[0] == 0: *************** *** 2709,2715 **** assert digit >> CHUNK == 0 top = (top << CHUNK) | digit ! f = f - digit assert 0.0 <= f < 1.0 ! e = e - CHUNK assert top > 0 --- 2711,2717 ---- assert digit >> CHUNK == 0 top = (top << CHUNK) | digit ! f -= digit assert 0.0 <= f < 1.0 ! e -= CHUNK assert top > 0 *************** *** 2719,2728 **** # be removed without changing the result). while e < 0 and top & 1 == 0: ! top = top >> 1 ! e = e + 1 # Transform this into an equal value top' * 10**e'. if e > 0: ! top = top << e e = 0 elif e < 0: --- 2721,2730 ---- # be removed without changing the result). while e < 0 and top & 1 == 0: ! top >>= 1 ! e += 1 # Transform this into an equal value top' * 10**e'. if e > 0: ! top <<= e e = 0 elif e < 0: *************** *** 2738,2742 **** break top = newtop ! e = e + 1 return "%s%se%d" % (sign, str(top), e) --- 2740,2744 ---- break top = newtop ! e += 1 return "%s%se%d" % (sign, str(top), e)

1 0