Mailman 3 June 2004 - Python-checkins

python/dist/src/Doc/lib libfcntl.tex,1.34,1.35
by montanaro＠users.sourceforge.net 30 Jun '04

30 Jun '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22598 Modified Files: libfcntl.tex Log Message: use file() in preference to open() Index: libfcntl.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libfcntl.tex,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** libfcntl.tex 13 Jun 2004 21:11:03 -0000 1.34 --- libfcntl.tex 30 Jun 2004 21:06:45 -0000 1.35 *************** *** 154,162 **** import struct, fcntl ! file = open(...) ! rv = fcntl(file, fcntl.F_SETFL, os.O_NDELAY) lockdata = struct.pack('hhllhh', fcntl.F_WRLCK, 0, 0, 0, 0, 0) ! rv = fcntl.fcntl(file, fcntl.F_SETLKW, lockdata) \end{verbatim} --- 154,162 ---- import struct, fcntl ! f = file(...) ! rv = fcntl(f, fcntl.F_SETFL, os.O_NDELAY) lockdata = struct.pack('hhllhh', fcntl.F_WRLCK, 0, 0, 0, 0, 0) ! rv = fcntl.fcntl(f, fcntl.F_SETLKW, lockdata) \end{verbatim}

1 0

python/nondist/sandbox/decimal Decimal.py, 1.33, 1.34
by rhettinger＠users.sourceforge.net 30 Jun '04

30 Jun '04

Update of /cvsroot/python/python/nondist/sandbox/decimal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30998 Modified Files: Decimal.py Log Message: Part IV: docstrings and doctests Index: Decimal.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/decimal/Decimal.py,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** Decimal.py 30 Jun 2004 18:49:07 -0000 1.33 --- Decimal.py 30 Jun 2004 19:11:40 -0000 1.34 *************** *** 212,216 **** class Clamped(DecimalException): ! """Exponent of a 0 changed to fit bounds""" --- 212,225 ---- class Clamped(DecimalException): ! """Exponent of a 0 changed to fit bounds. ! ! This occurs and signals clamped if the exponent of a result has been ! altered in order to fit the constraints of a specific concrete ! representation. This may occur when the exponent of a zero result would ! be outside the bounds of a representation, or when a large normal ! number would have an encoded exponent that cannot be represented. In ! this latter case, the exponent is reduced to fit and the corresponding ! number of zero digits are appended to the coefficient ("fold-down"). ! """ *************** *** 240,244 **** class ConversionSyntax(InvalidOperation): ! """Trying to convert badly formed string.""" def handle(self, context, *args): --- 249,258 ---- class ConversionSyntax(InvalidOperation): ! """Trying to convert badly formed string. ! ! This occurs and signals invalid-operation if an string is being ! converted to a number and it does not conform to the numeric string ! syntax. The result is [0,qNaN]. ! """ def handle(self, context, *args): *************** *** 248,256 **** """Division by 0. ! x / 0 ! Different from ZeroDivisionError because if the trap is disabled, ! (+-) INF is returned. ! Pass in the sign, and another argument will return a 2-tuple ! (for divmod) instead of the single number. """ --- 262,273 ---- """Division by 0. ! This occurs and signals division-by-zero if division of a finite number ! by zero was attempted (during a divide-integer or divide operation, or a ! power operation with negative right-hand operand), and the dividend was ! not zero. ! ! The result of the operation is [sign,inf], where sign is the exclusive ! or of the signs of the operands for divide, or is 1 for an odd power of ! –0, for power. """ *************** *** 263,268 **** """Cannot perform the division adequately. ! Result of a divide-integer or remainder option longer than precision ! Not actually raised. """ --- 280,286 ---- """Cannot perform the division adequately. ! This occurs and signals invalid-operation if the integer result of a ! divide-integer or remainder operation had too many digits (would be ! longer than precision). The result is [0,qNaN]. """ *************** *** 273,283 **** """Undefined result of division. ! 0 / 0 ! Not a ZeroDivisionError, because it isn't infinity, ! but can be anything. ! If the trap is disabled, returns NaN. ! ! If arguments are passed, it returns a 2-tuple (for divmod) as opposed ! to a single tuple. """ --- 291,297 ---- """Undefined result of division. ! This occurs and signals invalid-operation if division by zero was ! attempted (during a divide-integer, divide, or remainder operation), and ! the dividend is also zero. The result is [0,qNaN]. """ *************** *** 288,296 **** class Inexact(DecimalException): ! """Had to round, losing information.""" default = 0 class InvalidContext(InvalidOperation): ! """Invalid context. Unknown rounding, for example.""" def handle(self, context, *args): --- 302,327 ---- class Inexact(DecimalException): ! """Had to round, losing information. ! ! This occurs and signals inexact whenever the result of an operation is ! not exact (that is, it needed to be rounded and any discarded digits ! were non-zero), or if an overflow or underflow condition occurs. The ! result in all cases is unchanged. ! ! The inexact signal may be tested (or trapped) to determine if a given ! operation (or sequence of operations) was inexact. ! """ default = 0 class InvalidContext(InvalidOperation): ! """Invalid context. Unknown rounding, for example. ! ! This occurs and signals invalid-operation if an invalid context was ! detected during an operation. This can occur if contexts are not checked ! on creation and either the precision exceeds the capability of the ! underlying concrete representation or an unknown or unsupported rounding ! was specified. These aspects of the context need only be checked when ! the values are required to be used. The result is [0,qNaN]. ! """ def handle(self, context, *args): *************** *** 298,325 **** class Rounded(DecimalException): ! """Number got rounded (not necessarily changed during rounding)""" default = 0 class Subnormal(DecimalException): ! """Exponent < Emin before rounding""" pass class Overflow(Inexact, Rounded): ! """Number overflows ! Rescale with coefficient becoming greater than prec long ! Adjusted exponent greater than Emax ! Power's adjusted exponent above ABSOLUTE_EMAX ! Pass in the sign, and the result is: ! rounding in (half-up, half-even, half-down, up) => signed INF ! Otherwise, if the sign is negative: ! If rounding is floor, return -INF ! otherwise (rounding in (ceiling, down)) return negative number ! with highest absolute value possible (9.999999...eEmin) ! Sign positive: ! rounding = ceiling => INF ! rounding in (floor, down) => maximum finite number (9.9999...eEmax) ! """ def handle(self, context, sign, *args): --- 329,377 ---- class Rounded(DecimalException): ! """Number got rounded (not necessarily changed during rounding). ! ! This occurs and signals rounded whenever the result of an operation is ! rounded (that is, some zero or non-zero digits were discarded from the ! coefficient), or if an overflow or underflow condition occurs. The ! result in all cases is unchanged. ! ! The rounded signal may be tested (or trapped) to determine if a given ! operation (or sequence of operations) caused a loss of precision. ! """ default = 0 class Subnormal(DecimalException): ! """Exponent < Emin before rounding. ! ! This occurs and signals subnormal whenever the result of a conversion or ! operation is subnormal (that is, its adjusted exponent is less than ! Emin, before any rounding). The result in all cases is unchanged. ! ! The subnormal signal may be tested (or trapped) to determine if a given ! or operation (or sequence of operations) yielded a subnormal result. ! """ pass class Overflow(Inexact, Rounded): ! """Numerical overflow. ! This occurs and signals overflow if the adjusted exponent of a result ! (from a conversion or from an operation that is not an attempt to divide ! by zero), after rounding, would be greater than the largest value that ! can be handled by the implementation (the value Emax). ! The result depends on the rounding mode: ! ! For round-half-up and round-half-even (and for round-half-down and ! round-up, if implemented), the result of the operation is [sign,inf], ! where sign is the sign of the intermediate result. For round-down, the ! result is the largest finite number that can be represented in the ! current precision, with the sign of the intermediate result. For ! round-ceiling, the result is the same as for round-down if the sign of ! the intermediate result is 1, or is [0,inf] otherwise. For round-floor, ! the result is the same as for round-down if the sign of the intermediate ! result is 0, or is [1,inf] otherwise. In all cases, Inexact and Rounded ! will also be raised. ! """ def handle(self, context, sign, *args): *************** *** 340,344 **** class Underflow(Inexact, Rounded, Subnormal): ! """Number too small, got rounded to 0""" --- 392,408 ---- class Underflow(Inexact, Rounded, Subnormal): ! """Numerical underflow with result rounded to 0. ! ! This occurs and signals underflow if a result is inexact and the ! adjusted exponent of the result would be smaller (more negative) than ! the smallest value that can be handled by the implementation (the value ! Emin). That is, the result is both inexact and subnormal. ! ! The result after an underflow will be a subnormal number rounded, if ! necessary, so that its exponent is not less than Etiny. This may result ! in 0 with the sign of the intermediate result and an exponent of Etiny. ! ! In all cases, Inexact, Rounded, and Subnormal will also be raised. ! """ *************** *** 2412,2415 **** --- 2476,2525 ---- def power(self, a, b, modulo=None): + """Raises a to the power of b, to modulo if given. + + The right-hand operand must be a whole number whose integer part (after + any exponent has been applied) has no more than 9 digits and whose + fractional part (if any) is all zeros before any rounding. The operand + may be positive, negative, or zero; if negative, the absolute value of + the power is used, and the left-hand operand is inverted (divided into + 1) before use. + + If the increased precision needed for the intermediate calculations + exceeds the capabilities of the implementation then an Invalid operation + condition is raised. + + If, when raising to a negative power, an underflow occurs during the + division into 1, the operation is not halted at that point but + continues. + + >>> Context(prec=9).power(Decimal('2'), Decimal('3')) + Decimal("8") + >>> Context(prec=9).power(Decimal('2'), Decimal('-3')) + Decimal("0.125") + >>> Context(prec=9).power(Decimal('1.7'), Decimal('8')) + Decimal("69.7575744") + >>> Context(prec=9).power(Decimal('Infinity'), Decimal('-2')) + Decimal("0") + >>> Context(prec=9).power(Decimal('Infinity'), Decimal('-1')) + Decimal("0") + >>> Context(prec=9).power(Decimal('Infinity'), Decimal('0')) + Decimal("1") + >>> Context(prec=9).power(Decimal('Infinity'), Decimal('1')) + Decimal("Infinity") + >>> Context(prec=9).power(Decimal('Infinity'), Decimal('2')) + Decimal("Infinity") + >>> Context(prec=9).power(Decimal('-Infinity'), Decimal('-2')) + Decimal("0") + >>> Context(prec=9).power(Decimal('-Infinity'), Decimal('-1')) + Decimal("-0") + >>> Context(prec=9).power(Decimal('-Infinity'), Decimal('0')) + Decimal("1") + >>> Context(prec=9).power(Decimal('-Infinity'), Decimal('1')) + Decimal("-Infinity") + >>> Context(prec=9).power(Decimal('-Infinity'), Decimal('2')) + Decimal("Infinity") + >>> Context(prec=9).power(Decimal('0'), Decimal('0')) + Decimal("NaN") + """ return a.__pow__(b, modulo, context=self) *************** *** 2576,2582 **** --- 2686,2700 ---- def to_eng_string(self, a): + """Converts a number to a string, using scientific notation. + + The operation is not affected by the context. + """ return a.to_eng_string(context=self) def to_sci_string(self, a): + """Converts a number to a string, using scientific notation. + + The operation is not affected by the context. + """ return a.__str__(context=self)

1 0

python/nondist/sandbox/decimal Decimal.py, 1.32, 1.33
by rhettinger＠users.sourceforge.net 30 Jun '04

30 Jun '04

Update of /cvsroot/python/python/nondist/sandbox/decimal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26046 Modified Files: Decimal.py Log Message: * Part III: docstrings and doctests * Localize some inner loop variables Index: Decimal.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/decimal/Decimal.py,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** Decimal.py 30 Jun 2004 08:16:42 -0000 1.32 --- Decimal.py 30 Jun 2004 18:49:07 -0000 1.33 *************** *** 1038,1041 **** --- 1038,1042 ---- op1, op2 = op2, op1 + _divmod = divmod accumulator = [0]*(len(self._int) + len(other._int)) for i in xrange(len(op2)): *************** *** 1045,1049 **** carry = 0 for j in xrange(len(op1)): ! carry, accumulator[i+j] = divmod( mult * op1[j] + carry + accumulator[i+j], 10) --- 1046,1050 ---- carry = 0 for j in xrange(len(op1)): ! carry, accumulator[i+j] = _divmod( mult * op1[j] + carry + accumulator[i+j], 10) *************** *** 2204,2214 **** --- 2205,2267 ---- #Methods def abs(self, a): + """Returns the absolute value of the operand. + + If the operand is negative, the result is the same as using the minus + operation on the operand. Otherwise, the result is the same as using + the plus operation on the operand. + + >>> Context(prec=9).abs(Decimal('2.1')) + Decimal("2.1") + >>> Context(prec=9).abs(Decimal('-100')) + Decimal("100") + >>> Context(prec=9).abs(Decimal('101.5')) + Decimal("101.5") + >>> Context(prec=9).abs(Decimal('-101.5')) + Decimal("101.5") + """ return a.__abs__(context=self) + def add(self, a, b): + """Return the sum of the two operands. + + >>> Context(prec=9).add(Decimal('12'), Decimal('7.00')) + Decimal("19.00") + >>> Context(prec=9).add(Decimal('1E+2'), Decimal('1.01E+4')) + Decimal("1.02E+4") + """ return a.__add__(b, context=self) + def _apply(self, a): return str(a._fix(context=self)) + def compare(self, a, b): + """Compares values numerically. + + If the signs of the operands differ, a value representing each operand + (’-1’ if the operand is less than zero, ’0’ if the operand is zero or + negative zero, or ’1’ if the operand is greater than zero) is used in + place of that operand for the comparison instead of the actual + operand. + + The comparison is then effected by subtracting the second operand from + the first and then returning a value according to the result of the + subtraction: ’-1’ if the result is less than zero, ’0’ if the result is + zero or negative zero, or ’1’ if the result is greater than zero. + + >>> Context(prec=9).compare(Decimal('2.1'), Decimal('3')) + Decimal("-1") + >>> Context(prec=9).compare(Decimal('2.1'), Decimal('2.1')) + Decimal("0") + >>> Context(prec=9).compare(Decimal('2.1'), Decimal('2.10')) + Decimal("0") + >>> Context(prec=9).compare(Decimal('3'), Decimal('2.1')) + Decimal("1") + >>> Context(prec=9).compare(Decimal('2.1'), Decimal('-3')) + Decimal("1") + >>> Context(prec=9).compare(Decimal('-3'), Decimal('2.1')) + Decimal("-1") + """ return a.compare(b, context=self) + def divide(self, a, b): """Decimal division in a specified context. *************** *** 2251,2254 **** --- 2304,2308 ---- def divmod(self, a, b): return a.__divmod__(b, context=self) + def max(self, a,b): """max compares two values numerically and returns the maximum. *************** *** 2466,2483 **** --- 2520,2617 ---- def same_quantum(self, a, b): + """Returns True if the two operands have the same exponent. + + The result is never affected by either the sign or the coefficient of + either operand. + + >>> Context(prec=9).same_quantum(Decimal('2.17'), Decimal('0.001')) + False + >>> Context(prec=9).same_quantum(Decimal('2.17'), Decimal('0.01')) + True + >>> Context(prec=9).same_quantum(Decimal('2.17'), Decimal('1')) + False + >>> Context(prec=9).same_quantum(Decimal('Inf'), Decimal('-Inf')) + True + """ return a.same_quantum(b) + def sqrt(self, a): + """Returns the square root of a non-negative number to context precision. + + If the result must be inexact, it is rounded using the round-half-even + algorithm. + + >>> Context(prec=9).sqrt(Decimal('0')) + Decimal("0") + >>> Context(prec=9).sqrt(Decimal('-0')) + Decimal("-0") + >>> Context(prec=9).sqrt(Decimal('0.39')) + Decimal("0.624499800") + >>> Context(prec=9).sqrt(Decimal('100')) + Decimal("10") + >>> Context(prec=9).sqrt(Decimal('1')) + Decimal("1") + >>> Context(prec=9).sqrt(Decimal('1.0')) + Decimal("1.0") + >>> Context(prec=9).sqrt(Decimal('1.00')) + Decimal("1.0") + >>> Context(prec=9).sqrt(Decimal('7')) + Decimal("2.64575131") + >>> Context(prec=9).sqrt(Decimal('10')) + Decimal("3.16227766") + """ return a.sqrt(context=self) + def subtract(self, a, b): + """Return the sum of the two operands. + + >>> Context(prec=9).subtract(Decimal('1.3'), Decimal('1.07')) + Decimal("0.23") + >>> Context(prec=9).subtract(Decimal('1.3'), Decimal('1.30')) + Decimal("0.00") + >>> Context(prec=9).subtract(Decimal('1.3'), Decimal('2.07')) + Decimal("-0.77") + """ return a.__sub__(b, context=self) + def to_eng_string(self, a): return a.to_eng_string(context=self) + def to_sci_string(self, a): return a.__str__(context=self) + def to_integral(self, a): + """Rounds to an integer. + + When the operand has a negative exponent, the result is the same + as using the quantize() operation using the given operand as the + left-hand-operand, 1E+0 as the right-hand-operand, and the precision + of the operand as the precision setting, except that no flags will + be set. The rounding mode is taken from the context. + + >>> Context(prec=9).to_integral(Decimal('2.1')) + Decimal("2") + >>> Context(prec=9).to_integral(Decimal('100')) + Decimal("100") + >>> Context(prec=9).to_integral(Decimal('100.0')) + Decimal("100") + >>> Context(prec=9).to_integral(Decimal('101.5')) + Decimal("102") + >>> Context(prec=9).to_integral(Decimal('-101.5')) + Decimal("-102") + >>> Context(prec=9).to_integral(Decimal('10E+5')) + Decimal("1.0E+6") + >>> Context(prec=9).to_integral(Decimal('7.89E+77')) + Decimal("7.89E+77") + >>> Context(prec=9).to_integral(Decimal('-Inf')) + Decimal("-Infinity") + """ return a.to_integral(context=self) class _WorkRep(object): __slots__ = ('sign','int','exp') + # sign: -1 None 1 + # int: list + # exp: None, int, or string def __init__(self, value=None): *************** *** 2559,2582 **** """ ! self.int.reverse() alist.reverse() carry = 0 for x in xrange(len(alist)): ! self.int[x] -= alist[x] + carry ! if self.int[x] < 0: carry = 1 ! self.int[x] += 10 else: carry = 0 if carry: ! self.int[x+1] -= 1 ! last = len(self.int)-1 ! while len(self.int) > 1 and self.int[last] == 0: last -= 1 if last == 0: break ! self.int[last+1:]=[] ! self.int.reverse() alist.reverse() return --- 2693,2717 ---- """ ! selfint = self.int ! selfint.reverse() alist.reverse() carry = 0 for x in xrange(len(alist)): ! selfint[x] -= alist[x] + carry ! if selfint[x] < 0: carry = 1 ! selfint[x] += 10 else: carry = 0 if carry: ! selfint[x+1] -= 1 ! last = len(selfint)-1 ! while len(selfint) > 1 and selfint[last] == 0: last -= 1 if last == 0: break ! selfint[last+1:]=[] ! selfint.reverse() alist.reverse() return

1 0

python/dist/src/Misc NEWS,1.1015,1.1016
by mwh＠users.sourceforge.net 30 Jun '04

30 Jun '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9982 Modified Files: NEWS Log Message: tyop Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1015 retrieving revision 1.1016 diff -C2 -d -r1.1015 -r1.1016 *** NEWS 30 Jun 2004 09:06:29 -0000 1.1015 --- NEWS 30 Jun 2004 09:09:38 -0000 1.1016 *************** *** 379,383 **** - asyncore.loop now has a repeat count parameter that defaults to ! looping forever.. - The distutils sdist command now ignores all .svn directories, in --- 379,383 ---- - asyncore.loop now has a repeat count parameter that defaults to ! looping forever. - The distutils sdist command now ignores all .svn directories, in

1 0

python/dist/src/Misc NEWS,1.1014,1.1015
by mwh＠users.sourceforge.net 30 Jun '04

30 Jun '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9602 Modified Files: NEWS Log Message: restore NEWS entry for 957240 Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1014 retrieving revision 1.1015 diff -C2 -d -r1.1014 -r1.1015 *** NEWS 29 Jun 2004 04:08:23 -0000 1.1014 --- NEWS 30 Jun 2004 09:06:29 -0000 1.1015 *************** *** 378,381 **** --- 378,384 ---- installation scheme for all platforms. + - asyncore.loop now has a repeat count parameter that defaults to + looping forever.. + - The distutils sdist command now ignores all .svn directories, in addition to CVS and RCS directories. .svn directories hold

1 0

python/dist/src/Lib asyncore.py,1.52,1.53
by mwh＠users.sourceforge.net 30 Jun '04

30 Jun '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8745/Lib Modified Files: asyncore.py Log Message: Check in the updated version of patch #957240, which doesn't rely on the marshalling characteristics of infinities. Index: asyncore.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/asyncore.py,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** asyncore.py 14 Jun 2004 04:58:42 -0000 1.52 --- asyncore.py 30 Jun 2004 09:02:32 -0000 1.53 *************** *** 158,162 **** poll3 = poll2 # Alias for backward compatibility ! def loop(timeout=30.0, use_poll=False, map=None): if map is None: map = socket_map --- 158,162 ---- poll3 = poll2 # Alias for backward compatibility ! def loop(timeout=30.0, use_poll=False, map=None, count=None): if map is None: map = socket_map *************** *** 167,172 **** poll_fun = poll ! while map: ! poll_fun(timeout, map) class dispatcher: --- 167,178 ---- poll_fun = poll ! if count is None: ! while map: ! poll_fun(timeout, map) ! ! else: ! while map and count > 0: ! poll_fun(timeout, map) ! count = count - 1 class dispatcher: *************** *** 524,525 **** --- 530,532 ---- self.socket = file_wrapper(fd) self.add_channel() +

1 0

python/dist/src/Doc/lib libasyncore.tex, 1.16, 1.17
by mwh＠users.sourceforge.net 30 Jun '04

30 Jun '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8745/Doc/lib Modified Files: libasyncore.tex Log Message: Check in the updated version of patch #957240, which doesn't rely on the marshalling characteristics of infinities. Index: libasyncore.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libasyncore.tex,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** libasyncore.tex 14 Jun 2004 04:58:41 -0000 1.16 --- libasyncore.tex 30 Jun 2004 09:02:33 -0000 1.17 *************** *** 45,62 **** \begin{funcdesc}{loop}{\optional{timeout\optional{, use_poll\optional{, ! map}}}} ! Enter a polling loop that only terminates after all open channels ! have been closed. All arguments are optional. The \var{timeout} ! argument sets the timeout parameter for the appropriate ! \function{select()} or \function{poll()} call, measured in seconds; ! the default is 30 seconds. The \var{use_poll} parameter, if true, ! indicates that \function{poll()} should be used in preference to ! \function{select()} (the default is \code{False}). The \var{map} parameter ! is a dictionary whose items are the channels to watch. As channels ! are closed they are deleted from their map. If \var{map} is ! omitted, a global map is used (this map is updated by the default ! class \method{__init__()} ! -- make sure you extend, rather than override, \method{__init__()} ! if you want to retain this behavior). Channels (instances of \class{asyncore.dispatcher}, \class{asynchat.async_chat} --- 45,62 ---- \begin{funcdesc}{loop}{\optional{timeout\optional{, use_poll\optional{, ! map\optional{,count}}}}} ! Enter a polling loop that terminates after count passes or all open ! channels have been closed. All arguments are optional. The \var(count) ! parameter defaults to None, resulting in the loop terminating only ! when all channels have been closed. The \var{timeout} argument sets the ! timeout parameter for the appropriate \function{select()} or ! \function{poll()} call, measured in seconds; the default is 30 seconds. ! The \var{use_poll} parameter, if true, indicates that \function{poll()} ! should be used in preference to \function{select()} (the default is ! \code{False}). The \var{map} parameter is a dictionary whose items are ! the channels to watch. As channels are closed they are deleted from their ! map. If \var{map} is omitted, a global map is used (this map is updated ! by the default class \method{__init__()} -- make sure you extend, rather ! than override, \method{__init__()} if you want to retain this behavior). Channels (instances of \class{asyncore.dispatcher}, \class{asynchat.async_chat}

1 0

python/nondist/sandbox/decimal Decimal.py, 1.31, 1.32
by rhettinger＠users.sourceforge.net 30 Jun '04

30 Jun '04

Update of /cvsroot/python/python/nondist/sandbox/decimal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv543 Modified Files: Decimal.py Log Message: Complete the int/long unification. Index: Decimal.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/decimal/Decimal.py,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Decimal.py 30 Jun 2004 08:06:25 -0000 1.31 --- Decimal.py 30 Jun 2004 08:16:42 -0000 1.32 *************** *** 1373,1377 **** raise OverflowError, "Cannot convert infinity to long" if not self: ! return 0L sign = '-'*self._sign if self._exp >= 0: --- 1373,1377 ---- raise OverflowError, "Cannot convert infinity to long" if not self: ! return 0 sign = '-'*self._sign if self._exp >= 0: *************** *** 1382,1386 **** tmp = list(self._int) tmp.reverse() ! val = 0L while tmp: val *= 10 --- 1382,1386 ---- tmp = list(self._int) tmp.reverse() ! val = 0 while tmp: val *= 10

1 0

python/nondist/sandbox/decimal Decimal.py, 1.30, 1.31
by rhettinger＠users.sourceforge.net 30 Jun '04

30 Jun '04

Update of /cvsroot/python/python/nondist/sandbox/decimal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31119 Modified Files: Decimal.py Log Message: Int/long unification. Use int() everywhere. Only call long() when requested. Index: Decimal.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/decimal/Decimal.py,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Decimal.py 30 Jun 2004 07:19:21 -0000 1.30 --- Decimal.py 30 Jun 2004 08:06:25 -0000 1.31 *************** *** 441,445 **** self._exp = value[2] else: ! self._exp = long(value[2]) return --- 441,445 ---- self._exp = value[2] else: ! self._exp = int(value[2]) return *************** *** 451,455 **** self._sign = 1 self._int = tuple(value.int) ! self._exp = long(value.exp) return --- 451,455 ---- self._sign = 1 self._int = tuple(value.int) ! self._exp = int(value.exp) return *************** *** 627,631 **** """ if self._exp >= 0: ! return hash(long(self)) else: return hash( (self._sign, self._int, self._exp) ) --- 627,631 ---- """ if self._exp >= 0: ! return hash(int(self)) else: return hash( (self._sign, self._int, self._exp) ) *************** *** 1365,1370 **** return float(str(self)) ! def __long__(self): ! """Converts self to a long, truncating if necessary.""" if self._isnan(): context = getcontext() --- 1365,1370 ---- return float(str(self)) ! def __int__(self): ! """Converts self to a int, truncating if necessary.""" if self._isnan(): context = getcontext() *************** *** 1377,1383 **** if self._exp >= 0: s = sign + ''.join(map(str, self._int)) + '0'*self._exp ! return long(s) s = sign + ''.join(map(str, self._int))[:self._exp] ! return long(s) tmp = list(self._int) tmp.reverse() --- 1377,1383 ---- if self._exp >= 0: s = sign + ''.join(map(str, self._int)) + '0'*self._exp ! return int(s) s = sign + ''.join(map(str, self._int))[:self._exp] ! return int(s) tmp = list(self._int) tmp.reverse() *************** *** 1386,1397 **** val *= 10 val += tmp.pop() ! return long(((-1) ** self._sign) * val * 10.**int(self._exp)) ! def __int__(self): ! """Converts to a regular int. ! Equivalent to int(long(self)) """ ! return int(self.__long__()) def _fix(self, prec=None, rounding=None, folddown=None, context=None): --- 1386,1397 ---- val *= 10 val += tmp.pop() ! return int(((-1) ** self._sign) * val * 10.**int(self._exp)) ! def __long__(self): ! """Converts to a long. ! Equivalent to long(int(self)) """ ! return long(self.__int__()) def _fix(self, prec=None, rounding=None, folddown=None, context=None): *************** *** 1657,1661 **** sign = self._sign and not n._iseven() ! n = long(n) if self._isinfinity(): --- 1657,1661 ---- sign = self._sign and not n._iseven() ! n = int(n) if self._isinfinity(): *************** *** 2151,2159 **** def Etiny(self): """Returns Etiny (= Emin - prec + 1)""" ! return long(self.Emin - self.prec + 1) def Etop(self): """Returns maximum exponent (= Emin - prec + 1)""" ! return long(self.Emax - self.prec + 1) def _set_rounding_decision(self, type): --- 2151,2159 ---- def Etiny(self): """Returns Etiny (= Emin - prec + 1)""" ! return int(self.Emin - self.prec + 1) def Etop(self): """Returns maximum exponent (= Emin - prec + 1)""" ! return int(self.Emax - self.prec + 1) def _set_rounding_decision(self, type): *************** *** 2829,2833 **** exp = 0 else: ! exp = long(exp) intpart = m.group('int') --- 2829,2833 ---- exp = 0 else: ! exp = int(exp) intpart = m.group('int')

1 0

python/nondist/sandbox/decimal Decimal.py, 1.29, 1.30 test_Decimal.py, 1.23, 1.24
by rhettinger＠users.sourceforge.net 30 Jun '04

30 Jun '04

Update of /cvsroot/python/python/nondist/sandbox/decimal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22565 Modified Files: Decimal.py test_Decimal.py Log Message: * Part II: docstrings and doctests * removed Lost Digits which was unused Index: Decimal.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/decimal/Decimal.py,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Decimal.py 30 Jun 2004 05:38:25 -0000 1.29 --- Decimal.py 30 Jun 2004 07:19:21 -0000 1.30 *************** *** 297,304 **** return NaN - class LostDigits(DecimalException): - """Actually, this is not used for the extended version.""" - pass - class Rounded(DecimalException): """Number got rounded (not necessarily changed during rounding)""" --- 297,300 ---- *************** *** 2363,2372 **** def power(self, a, b, modulo=None): return a.__pow__(b, modulo, context=self) def remainder(self, a, b): return a.__mod__(b, context=self) def remainder_near(self, a, b): return a.remainder_near(b, context=self) ! def quantize(self, a, b): ! return a.quantize(b, context=self) def same_quantum(self, a, b): return a.same_quantum(b) --- 2359,2468 ---- def power(self, a, b, modulo=None): return a.__pow__(b, modulo, context=self) + + def quantize(self, a, b): + """Returns a value equal to 'a' (rounded) and having the exponent of 'b'. + + The coefficient of the result is derived from that of the left-hand + operand. It may be rounded using the current rounding setting (if the + exponent is being increased), multiplied by a positive power of ten (if + the exponent is being decreased), or is unchanged (if the exponent is + already equal to that of the right-hand operand). + + Unlike other operations, if the length of the coefficient after the + quantize operation would be greater than precision then an Invalid + operation condition is raised. This guarantees that, unless there is an + error condition, the exponent of the result of a quantize is always + equal to that of the right-hand operand. + + Also unlike other operations, quantize will never raise Underflow, even + if the result is subnormal and inexact. + + >>> Context(prec=9).quantize(Decimal('2.17'), Decimal('0.001')) + Decimal("2.170") + >>> Context(prec=9).quantize(Decimal('2.17'), Decimal('0.01')) + Decimal("2.17") + >>> Context(prec=9).quantize(Decimal('2.17'), Decimal('0.1')) + Decimal("2.2") + >>> Context(prec=9).quantize(Decimal('2.17'), Decimal('1e+0')) + Decimal("2") + >>> Context(prec=9).quantize(Decimal('2.17'), Decimal('1e+1')) + Decimal("0E+1") + >>> Context(prec=9).quantize(Decimal('-Inf'), Decimal('Infinity')) + Decimal("-Infinity") + >>> Context(prec=9).quantize(Decimal('2'), Decimal('Infinity')) + Decimal("NaN") + >>> Context(prec=9).quantize(Decimal('-0.1'), Decimal('1')) + Decimal("-0") + >>> Context(prec=9).quantize(Decimal('-0'), Decimal('1e+5')) + Decimal("-0E+5") + >>> Context(prec=9).quantize(Decimal('+35236450.6'), Decimal('1e-2')) + Decimal("NaN") + >>> Context(prec=9).quantize(Decimal('-35236450.6'), Decimal('1e-2')) + Decimal("NaN") + >>> Context(prec=9).quantize(Decimal('217'), Decimal('1e-1')) + Decimal("217.0") + >>> Context(prec=9).quantize(Decimal('217'), Decimal('1e-0')) + Decimal("217") + >>> Context(prec=9).quantize(Decimal('217'), Decimal('1e+1')) + Decimal("2.2E+2") + >>> Context(prec=9).quantize(Decimal('217'), Decimal('1e+2')) + Decimal("2E+2") + """ + return a.quantize(b, context=self) + def remainder(self, a, b): + """Returns the remainder from integer division. + + The result is the residue of the dividend after the operation of + calculating integer division as described for divide-integer, rounded to + precision digits if necessary. The sign of the result, if non-zero, is + the same as that of the original dividend. + + This operation will fail under the same conditions as integer division + (that is, if integer division on the same two operands would fail, the + remainder cannot be calculated). + + >>> Context(prec=9).remainder(Decimal('2.1'), Decimal('3')) + Decimal("2.1") + >>> Context(prec=9).remainder(Decimal('10'), Decimal('3')) + Decimal("1") + >>> Context(prec=9).remainder(Decimal('-10'), Decimal('3')) + Decimal("-1") + >>> Context(prec=9).remainder(Decimal('10.2'), Decimal('1')) + Decimal("0.2") + >>> Context(prec=9).remainder(Decimal('10'), Decimal('0.3')) + Decimal("0.1") + >>> Context(prec=9).remainder(Decimal('3.6'), Decimal('1.3')) + Decimal("1.0") + """ return a.__mod__(b, context=self) + def remainder_near(self, a, b): + """Returns to be a – b × n, where n is the integer nearest the exact + value of a ÷ b (if two integers are equally near then the even one + is chosen). If the result is equal to 0 then its sign will be the + sign of a. + + This operation will fail under the same conditions as integer division + (that is, if integer division on the same two operands would fail, the + remainder cannot be calculated). + + >>> Context(prec=9).remainder_near(Decimal('2.1'), Decimal('3')) + Decimal("-0.9") + >>> Context(prec=9).remainder_near(Decimal('10'), Decimal('6')) + Decimal("-2") + >>> Context(prec=9).remainder_near(Decimal('10'), Decimal('3')) + Decimal("1") + >>> Context(prec=9).remainder_near(Decimal('-10'), Decimal('3')) + Decimal("-1") + >>> Context(prec=9).remainder_near(Decimal('10.2'), Decimal('1')) + Decimal("0.2") + >>> Context(prec=9).remainder_near(Decimal('10'), Decimal('0.3')) + Decimal("0.1") + >>> Context(prec=9).remainder_near(Decimal('3.6'), Decimal('1.3')) + Decimal("-0.3") + """ return a.remainder_near(b, context=self) ! def same_quantum(self, a, b): return a.same_quantum(b) *************** *** 2760,2761 **** --- 2856,2862 ---- return (sign, mantissa, exp) + + + ##if __name__ == '__main__': + ## import doctest, sys + ## doctest.testmod(sys.modules[__name__]) Index: test_Decimal.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/decimal/test_Decimal.py,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** test_Decimal.py 30 Jun 2004 04:22:54 -0000 1.23 --- test_Decimal.py 30 Jun 2004 07:19:21 -0000 1.24 *************** *** 56,60 **** 'invalid_context' : InvalidContext, 'invalid_operation' : InvalidOperation, - 'lost_digits' : LostDigits, 'overflow' : Overflow, 'rounded' : Rounded, --- 56,59 ---- *************** *** 344,351 **** def test_remainderNear(self): - """Tests the Decimal class on Cowlishaw's remainderNear tests. - - See www2.hursley.ibm.com/decimal/dectest.zip to download the suite. - """ self.eval_file(dir + 'remainderNear' + '.decTest') --- 343,346 ----

1 0