Mailman 3 September 2004 - Python-checkins

python/dist/src/Lib random.py,1.66,1.67
by rhettinger＠users.sourceforge.net Sept. 5, 2004

Sept. 5, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18618 Modified Files: random.py Log Message: Fulfill Martin's request to use try/except rather than a "look before you leap" approach. Makes the early call to os.urandom() unnecessary. Index: random.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/random.py,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- random.py 3 Sep 2004 19:09:22 -0000 1.66 +++ random.py 5 Sep 2004 00:00:41 -0000 1.67 @@ -44,6 +44,8 @@ from math import log as _log, exp as _exp, pi as _pi, e as _e from math import sqrt as _sqrt, acos as _acos, cos as _cos, sin as _sin from math import floor as _floor +from os import urandom as _urandom +from binascii import hexlify as _hexlify __all__ = ["Random","seed","random","uniform","randint","choice","sample", "randrange","shuffle","normalvariate","lognormvariate", @@ -59,13 +61,6 @@ BPF = 53 # Number of bits in a float RECIP_BPF = 2**-BPF -try: - from os import urandom as _urandom - from binascii import hexlify as _hexlify - _urandom(1) # verify that urandom is implemented -except (ImportError, NotImplementedError): - _urandom = None - # Translated by Guido van Rossum from C source provided by # Adrian Baddeley. Adapted by Raymond Hettinger for use with @@ -111,11 +106,11 @@ """ if a is None: - if _urandom is None: + try: + a = long(_hexlify(_urandom(16)), 16) + except NotImplementedError: import time a = long(time.time() * 256) # use fractional seconds - else: - a = long(_hexlify(_urandom(16)), 16) super(Random, self).seed(a) self.gauss_next = None @@ -620,11 +615,11 @@ """ if a is None: - if _urandom is None: + try: + a = long(_hexlify(_urandom(16)), 16) + except NotImplementedError: import time a = long(time.time() * 256) # use fractional seconds - else: - a = long(_hexlify(_urandom(16)), 16) if not isinstance(a, (int, long)): a = hash(a) @@ -759,14 +754,10 @@ def random(self): """Get the next random number in the range [0.0, 1.0).""" - if _urandom is None: - raise NotImplementedError('Cannot find hardware entropy source') return (long(_hexlify(_urandom(7)), 16) >> 3) * RECIP_BPF def getrandbits(self, k): """getrandbits(k) -> x. Generates a long int with k random bits.""" - if _urandom is None: - raise NotImplementedError('Cannot find hardware entropy source') if k <= 0: raise ValueError('number of bits must be greater than zero') if k != int(k):

1 0

python/dist/src/Lib/test test_pyclbr.py, 1.23, 1.24
by rhettinger＠users.sourceforge.net Sept. 4, 2004

Sept. 4, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17859 Modified Files: test_pyclbr.py Log Message: Teach a test about the different kinds of functions. Index: test_pyclbr.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pyclbr.py,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- test_pyclbr.py 4 Aug 2004 02:36:18 -0000 1.23 +++ test_pyclbr.py 4 Sep 2004 23:53:20 -0000 1.24 @@ -4,7 +4,7 @@ ''' from test.test_support import run_unittest import unittest, sys -from types import ClassType, FunctionType, MethodType +from types import ClassType, FunctionType, MethodType, BuiltinFunctionType import pyclbr from unittest import TestCase @@ -92,7 +92,7 @@ self.assertHasattr(module, name, ignore) py_item = getattr(module, name) if isinstance(value, pyclbr.Function): - self.assertEquals(type(py_item), FunctionType) + self.assert_(isinstance(py_item, (FunctionType, BuiltinFunctionType))) else: self.failUnless(isinstance(py_item, (ClassType, type))) real_bases = [base.__name__ for base in py_item.__bases__]

1 0

python/nondist/peps pep-0320.txt,1.16,1.17
by rhettinger＠users.sourceforge.net Sept. 4, 2004

Sept. 4, 2004

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7200 Modified Files: pep-0320.txt Log Message: Update completed features for Py2.4a3. Index: pep-0320.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0320.txt,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- pep-0320.txt 28 Jul 2004 10:39:55 -0000 1.16 +++ pep-0320.txt 4 Sep 2004 22:49:54 -0000 1.17 @@ -16,8 +16,7 @@ beta release. Bugs may be fixed until the final release. There will be at least two alpha releases, two beta releases, and - one release candidate. The release date is not yet fixed but a - rough target for the first alpha is July 2004. + one release candidate. The release date is not yet fixed. Release Manager @@ -30,20 +29,26 @@ July 9: alpha 1 [completed] - August 5/6: alpha 2 + August 5/6: alpha 2 [completed] - August 26/27: alpha 3 or beta 1 + Sept 3: alpha 3 [completed] Completed features for 2.4 PEP 218 Builtin Set Objects. PEP 289 Generator expressions. - + + PEP 292 Simpler String Substitutions to be implemented as a module. + + PEP 318: Function/method decorator syntax, using @syntax + PEP 322 Reverse Iteration. PEP 327: A Decimal package for fixed precision arithmetic. + PEP 328: Multi-line Imports + Encapsulate the decorate-sort-undecorate pattern in a keyword for list.sort(). @@ -63,14 +68,6 @@ These features are all planned for 2.4b1, but have not yet landed. - PEP 292 Simpler String Substitutions to be implemented as a module. - - PEP 318: Function/method decorator syntax, using @syntax - - PEP 328: Imports: Multi-line and Absolute/Relative. (Still quite - controversial.) No-one has stepped forward to champion this, so it's - looking like it might not make it in. - Deprecate and/or remove the modules listed in PEP 4 (posixfile, gopherlib, pre, others)

1 0

python/dist/src/Doc/lib libsignal.tex,1.25,1.26
by rhettinger＠users.sourceforge.net Sept. 4, 2004

Sept. 4, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22860 Modified Files: libsignal.tex Log Message: SF bug #1020540: a wrong link from "frame object" in lib index Index: libsignal.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libsignal.tex,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- libsignal.tex 13 Mar 2003 13:56:49 -0000 1.25 +++ libsignal.tex 4 Sep 2004 21:14:34 -0000 1.26 @@ -139,9 +139,10 @@ \exception{ValueError} exception to be raised. The \var{handler} is called with two arguments: the signal number - and the current stack frame (\code{None} or a frame object; see the - reference manual for a description of frame objects). -\obindex{frame} + and the current stack frame (\code{None} or a frame object; + for a description of frame objects, see the reference manual section + on the standard type hierarchy or see the attribute descriptions in + the \refmodule{inspect} module). \end{funcdesc} \subsection{Example}

1 0

python/dist/src/Lib/test test_random.py, 1.18, 1.19
by rhettinger＠users.sourceforge.net Sept. 4, 2004

Sept. 4, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12609 Modified Files: test_random.py Log Message: SF bug #1022010: Import random fails * Complete the previous patch by making sure that the MachineRandom tests are only run when the underlying resource is available. Index: test_random.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_random.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- test_random.py 30 Aug 2004 06:14:30 -0000 1.18 +++ test_random.py 4 Sep 2004 20:13:29 -0000 1.19 @@ -490,11 +490,14 @@ self.failUnless(set(random.__all__) <= set(dir(random))) def test_main(verbose=None): - testclasses = (WichmannHill_TestBasicOps, + testclasses = [WichmannHill_TestBasicOps, MersenneTwister_TestBasicOps, - HardwareRandom_TestBasicOps, TestDistributions, - TestModule) + TestModule] + + if random._urandom is not None: + testclasses.append(HardwareRandom_TestBasicOps) + test_support.run_unittest(*testclasses) # verify reference counting

1 0

python/dist/src/Lib/test test_compiler.py, 1.5, 1.6 test_decimal.py, 1.13, 1.14
by rhettinger＠users.sourceforge.net Sept. 4, 2004

Sept. 4, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11509 Modified Files: test_compiler.py test_decimal.py Log Message: Change the strategy for coping with time intensive tests from "all or none" to "all or some". This provides much greater test coverage without eating much time. It also makes it more likely that routine regression testing will unearth bugs. Index: test_compiler.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_compiler.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- test_compiler.py 8 Aug 2004 16:43:59 -0000 1.5 +++ test_compiler.py 4 Sep 2004 20:09:12 -0000 1.6 @@ -2,6 +2,7 @@ import os import test.test_support import unittest +from random import random class CompilerTest(unittest.TestCase): @@ -18,6 +19,8 @@ for basename in os.listdir(dir): if not basename.endswith(".py"): continue + if not TEST_ALL and random() < 0.98: + continue path = os.path.join(dir, basename) if test.test_support.verbose: print "compiling", path @@ -31,7 +34,8 @@ compiler.compile(buf, basename, "exec") def test_main(): - test.test_support.requires("compiler") + global TEST_ALL + TEST_ALL = test.test_support.is_resource_enabled("compiler") test.test_support.run_unittest(CompilerTest) if __name__ == "__main__": Index: test_decimal.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_decimal.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- test_decimal.py 17 Aug 2004 16:34:51 -0000 1.13 +++ test_decimal.py 4 Sep 2004 20:09:13 -0000 1.14 @@ -181,6 +181,10 @@ def eval_equation(self, s): #global DEFAULT_PRECISION #print DEFAULT_PRECISION + + if not TEST_ALL and random.random() < 0.90: + return + try: Sides = s.split('->') L = Sides[0].strip().split() @@ -997,9 +1001,13 @@ def test_main(arith=False, verbose=None): """ Execute the tests. - Runs arithmetic tests if arith is True or if the "decimal" resource - is enables in regrtest.py + Runs all arithmetic tests if arith is True or if the "decimal" resource + is enabled in regrtest.py """ + + global TEST_ALL + TEST_ALL = arith or is_resource_enabled('decimal') + test_classes = [ DecimalExplicitConstructionTest, DecimalImplicitConstructionTest, @@ -1008,20 +1016,17 @@ DecimalUsabilityTest, DecimalPythonAPItests, ContextAPItests, + DecimalTest, ] - if arith or is_resource_enabled('decimal'): - test_classes.extend([DecimalTest]) - run_unittest(*test_classes) import decimal as DecimalModule run_doctest(DecimalModule, verbose) - return if __name__ == '__main__': # Calling with no arguments runs all tests. - # Calling with "Skip" will skipover the arithmetic tests. + # Calling with "Skip" will skip over 90% of the arithmetic tests. if len(sys.argv) == 1: test_main(arith=True, verbose=True) elif len(sys.argv) == 2:

1 0

python/dist/src/Lib/test test_doctest.py, 1.41, 1.42
by tim_one＠users.sourceforge.net Sept. 4, 2004

Sept. 4, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11757/Lib/test Modified Files: test_doctest.py Log Message: Added IGNORE_EXCEPTION_DETAIL comparison option. The need is explained in the new docs. DocTestRunner.__run: Separate the determination of the example outcome from reporting that outcome, to squash brittle code duplication and excessive nesting. Index: test_doctest.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_doctest.py,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- test_doctest.py 29 Aug 2004 00:38:17 -0000 1.41 +++ test_doctest.py 4 Sep 2004 17:21:02 -0000 1.42 @@ -837,6 +837,43 @@ ValueError: message (1, 1) +However, IGNORE_EXCEPTION_DETAIL can be used to allow a mismatch in the +detail: + + >>> def f(x): + ... r''' + ... >>> raise ValueError, 'message' #doctest: +IGNORE_EXCEPTION_DETAIL + ... Traceback (most recent call last): + ... ValueError: wrong message + ... ''' + >>> test = doctest.DocTestFinder().find(f)[0] + >>> doctest.DocTestRunner(verbose=False).run(test) + (0, 1) + +But IGNORE_EXCEPTION_DETAIL does not allow a mismatch in the exception type: + + >>> def f(x): + ... r''' + ... >>> raise ValueError, 'message' #doctest: +IGNORE_EXCEPTION_DETAIL + ... Traceback (most recent call last): + ... TypeError: wrong type + ... ''' + >>> test = doctest.DocTestFinder().find(f)[0] + >>> doctest.DocTestRunner(verbose=False).run(test) + ... # doctest: +ELLIPSIS + ********************************************************************** + Line 2, in f + Failed example: + raise ValueError, 'message' #doctest: +IGNORE_EXCEPTION_DETAIL + Expected: + Traceback (most recent call last): + TypeError: wrong type + Got: + Traceback (most recent call last): + ... + ValueError: message + (1, 1) + If an exception is raised but not expected, then it is reported as an unexpected exception:

1 0

python/dist/src/Lib doctest.py,1.98,1.99
by tim_one＠users.sourceforge.net Sept. 4, 2004

Sept. 4, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11757/Lib Modified Files: doctest.py Log Message: Added IGNORE_EXCEPTION_DETAIL comparison option. The need is explained in the new docs. DocTestRunner.__run: Separate the determination of the example outcome from reporting that outcome, to squash brittle code duplication and excessive nesting. Index: doctest.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/doctest.py,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- doctest.py 4 Sep 2004 15:04:06 -0000 1.98 +++ doctest.py 4 Sep 2004 17:21:02 -0000 1.99 @@ -176,6 +176,7 @@ 'DONT_ACCEPT_BLANKLINE', 'NORMALIZE_WHITESPACE', 'ELLIPSIS', + 'IGNORE_EXCEPTION_DETAIL', 'COMPARISON_FLAGS', 'REPORT_UDIFF', 'REPORT_CDIFF', @@ -261,11 +262,13 @@ DONT_ACCEPT_BLANKLINE = register_optionflag('DONT_ACCEPT_BLANKLINE') NORMALIZE_WHITESPACE = register_optionflag('NORMALIZE_WHITESPACE') ELLIPSIS = register_optionflag('ELLIPSIS') +IGNORE_EXCEPTION_DETAIL = register_optionflag('IGNORE_EXCEPTION_DETAIL') COMPARISON_FLAGS = (DONT_ACCEPT_TRUE_FOR_1 | DONT_ACCEPT_BLANKLINE | NORMALIZE_WHITESPACE | - ELLIPSIS) + ELLIPSIS | + IGNORE_EXCEPTION_DETAIL) REPORT_UDIFF = register_optionflag('REPORT_UDIFF') REPORT_CDIFF = register_optionflag('REPORT_CDIFF') @@ -1293,6 +1296,10 @@ # to modify them). original_optionflags = self.optionflags + SUCCESS, FAILURE, BOOM = range(3) # `outcome` state + + check = self._checker.check_output + # Process each example. for examplenum, example in enumerate(test.examples): @@ -1337,45 +1344,53 @@ got = self._fakeout.getvalue() # the actual output self._fakeout.truncate(0) + outcome = FAILURE # guilty until proved innocent or insane # If the example executed without raising any exceptions, - # then verify its output and report its outcome. + # verify its output. if exception is None: - if self._checker.check_output(example.want, got, - self.optionflags): - if not quiet: - self.report_success(out, test, example, got) - else: - if not quiet: - self.report_failure(out, test, example, got) - failures += 1 + if check(example.want, got, self.optionflags): + outcome = SUCCESS - # If the example raised an exception, then check if it was - # expected. + # The example raised an exception: check if it was expected. else: exc_info = sys.exc_info() exc_msg = traceback.format_exception_only(*exc_info[:2])[-1] + if not quiet: + got += _exception_traceback(exc_info) - # If `example.exc_msg` is None, then we weren't - # expecting an exception. + # If `example.exc_msg` is None, then we weren't expecting + # an exception. if example.exc_msg is None: - if not quiet: - self.report_unexpected_exception(out, test, example, - exc_info) - failures += 1 - # If `example.exc_msg` matches the actual exception - # message (`exc_msg`), then the example succeeds. - elif (self._checker.check_output(example.exc_msg, exc_msg, - self.optionflags)): - if not quiet: - got += _exception_traceback(exc_info) - self.report_success(out, test, example, got) - # Otherwise, the example fails. - else: - if not quiet: - got += _exception_traceback(exc_info) - self.report_failure(out, test, example, got) - failures += 1 + outcome = BOOM + + # We expected an exception: see whether it matches. + elif check(example.exc_msg, exc_msg, self.optionflags): + outcome = SUCCESS + + # Another chance if they didn't care about the detail. + elif self.optionflags & IGNORE_EXCEPTION_DETAIL: + m1 = re.match(r'[^:]*:', example.exc_msg) + m2 = re.match(r'[^:]*:', exc_msg) + if m1 and m2 and check(m1.group(0), m2.group(0), + self.optionflags): + outcome = SUCCESS + + # Report the outcome. + if outcome is SUCCESS: + if not quiet: + self.report_success(out, test, example, got) + elif outcome is FAILURE: + if not quiet: + self.report_failure(out, test, example, got) + failures += 1 + elif outcome is BOOM: + if not quiet: + self.report_unexpected_exception(out, test, example, + exc_info) + failures += 1 + else: + assert False, ("unknown outcome", outcome) # Restore the option flags (in case they were modified) self.optionflags = original_optionflags

1 0

python/dist/src/Doc/lib libdoctest.tex,1.40,1.41
by tim_one＠users.sourceforge.net Sept. 4, 2004

Sept. 4, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11757/Doc/lib Modified Files: libdoctest.tex Log Message: Added IGNORE_EXCEPTION_DETAIL comparison option. The need is explained in the new docs. DocTestRunner.__run: Separate the determination of the example outcome from reporting that outcome, to squash brittle code duplication and excessive nesting. Index: libdoctest.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libdoctest.tex,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- libdoctest.tex 30 Aug 2004 16:19:24 -0000 1.40 +++ libdoctest.tex 4 Sep 2004 17:21:02 -0000 1.41 @@ -307,6 +307,9 @@ to be the start of the exception detail. Of course this does the right thing for genuine tracebacks. +\item When the \constant{IGNORE_EXCEPTION_DETAIL} doctest option is + is specified, everything following the leftmost colon is ignored. + \end{itemize} \versionchanged[The ability to handle a multi-line exception detail @@ -365,6 +368,34 @@ is prone to in regular expressions. \end{datadesc} +\begin{datadesc}{IGNORE_EXCEPTION_DETAIL} + When specified, an example that expects an exception passes if + an exception of the expected type is raised, even if the exception + detail does not match. For example, an example expecting + \samp{ValueError: 42} will pass if the actual exception raised is + \samp{ValueError: 3*14}, but will fail, e.g., if + \exception{TypeError} is raised. + + Note that a similar effect can be obtained using \constant{ELLIPSIS}, + and \constant{IGNORE_EXCEPTION_DETAIL} may go away when Python releases + prior to 2.4 become uninteresting. Until then, + \constant{IGNORE_EXCEPTION_DETAIL} is the only clear way to write a + doctest that doesn't care about the exception detail yet continues + to pass under Python releases prior to 2.4 (doctest directives + appear to be comments to them). For example, + +\begin{verbatim} +>>> (1, 2)[3] = 'moo' #doctest: +IGNORE_EXCEPTION_DETAIL +Traceback (most recent call last): + File "<stdin>", line 1, in ? +TypeError: object doesn't support item assignment +\end{verbatim} + + passes under Python 2.4 and Python 2.3. The detail changed in 2.4, + to say "does not" instead of "doesn't". + +\end{datadesc} + \begin{datadesc}{COMPARISON_FLAGS} A bitmask or'ing together all the comparison flags above. \end{datadesc} @@ -463,6 +494,7 @@ \versionchanged[Constants \constant{DONT_ACCEPT_BLANKLINE}, \constant{NORMALIZE_WHITESPACE}, \constant{ELLIPSIS}, + \constant{IGNORE_EXCEPTION_DETAIL}, \constant{REPORT_UDIFF}, \constant{REPORT_CDIFF}, \constant{REPORT_NDIFF}, \constant{REPORT_ONLY_FIRST_FAILURE}, \constant{COMPARISON_FLAGS} and \constant{REPORTING_FLAGS}

1 0

python/dist/src/Lib doctest.py,1.97,1.98
by tim_one＠users.sourceforge.net Sept. 4, 2004

Sept. 4, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19029/Lib Modified Files: doctest.py Log Message: Added a couple names to __all__. Index: doctest.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/doctest.py,v retrieving revision 1.97 retrieving revision 1.98 diff -u -d -r1.97 -r1.98 --- doctest.py 30 Aug 2004 16:19:24 -0000 1.97 +++ doctest.py 4 Sep 2004 15:04:06 -0000 1.98 @@ -176,10 +176,12 @@ 'DONT_ACCEPT_BLANKLINE', 'NORMALIZE_WHITESPACE', 'ELLIPSIS', + 'COMPARISON_FLAGS', 'REPORT_UDIFF', 'REPORT_CDIFF', 'REPORT_NDIFF', 'REPORT_ONLY_FIRST_FAILURE', + 'REPORTING_FLAGS', # 1. Utility Functions 'is_private', # 2. Example & DocTest

1 0