mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	 73e5a5b65d
			
		
	
	
		73e5a5b65d
		
	
	
	
	
		
			
			Merged revisions 46490-46494,46496,46498,46500,46506,46521,46538,46558,46563-46567,46570-46571,46583,46593,46595-46598,46604,46606,46609-46753 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r46610 | martin.v.loewis | 2006-06-03 09:42:26 +0200 (Sat, 03 Jun 2006) | 2 lines Updated version (win32-icons2.zip) from #1490384. ........ r46612 | andrew.kuchling | 2006-06-03 20:09:41 +0200 (Sat, 03 Jun 2006) | 1 line [Bug #1472084] Fix description of do_tag ........ r46614 | andrew.kuchling | 2006-06-03 20:33:35 +0200 (Sat, 03 Jun 2006) | 1 line [Bug #1475554] Strengthen text to say 'must' instead of 'should' ........ r46616 | andrew.kuchling | 2006-06-03 20:41:28 +0200 (Sat, 03 Jun 2006) | 1 line [Bug #1441864] Clarify description of 'data' argument ........ r46617 | andrew.kuchling | 2006-06-03 20:43:24 +0200 (Sat, 03 Jun 2006) | 1 line Minor rewording ........ r46619 | andrew.kuchling | 2006-06-03 21:02:35 +0200 (Sat, 03 Jun 2006) | 9 lines [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Fix by renaming the variable. In a different module, Neal fixed it by renaming _self to self. There's already a variable named 'self' here, so I used selfptr. (I'm committing this on a Mac without Tk, but it's a simple search-and-replace. <crosses fingers>, so I'll watch the buildbots and see what happens.) ........ r46621 | fredrik.lundh | 2006-06-03 23:56:05 +0200 (Sat, 03 Jun 2006) | 5 lines "_self" is a said to be a reserved word in Watcom C 10.6. I'm not sure that's really standard compliant behaviour, but I guess we have to fix that anyway... ........ r46622 | andrew.kuchling | 2006-06-04 00:44:42 +0200 (Sun, 04 Jun 2006) | 1 line Update readme ........ r46623 | andrew.kuchling | 2006-06-04 00:59:23 +0200 (Sun, 04 Jun 2006) | 1 line Drop 0 parameter ........ r46624 | andrew.kuchling | 2006-06-04 00:59:59 +0200 (Sun, 04 Jun 2006) | 1 line Some code tidying; use curses.wrapper ........ r46625 | andrew.kuchling | 2006-06-04 01:02:15 +0200 (Sun, 04 Jun 2006) | 1 line Use True; value returned from main is unused ........ r46626 | andrew.kuchling | 2006-06-04 01:07:21 +0200 (Sun, 04 Jun 2006) | 1 line Use true division, and the True value ........ r46627 | andrew.kuchling | 2006-06-04 01:09:58 +0200 (Sun, 04 Jun 2006) | 1 line Docstring fix; use True ........ r46628 | andrew.kuchling | 2006-06-04 01:15:56 +0200 (Sun, 04 Jun 2006) | 1 line Put code in a main() function; loosen up the spacing to match current code style ........ r46629 | andrew.kuchling | 2006-06-04 01:39:07 +0200 (Sun, 04 Jun 2006) | 1 line Use functions; modernize code ........ r46630 | andrew.kuchling | 2006-06-04 01:43:22 +0200 (Sun, 04 Jun 2006) | 1 line This demo requires Medusa (not just asyncore); remove it ........ r46631 | andrew.kuchling | 2006-06-04 01:46:36 +0200 (Sun, 04 Jun 2006) | 2 lines Remove xmlrpc demo -- it duplicates the SimpleXMLRPCServer module. ........ r46632 | andrew.kuchling | 2006-06-04 01:47:22 +0200 (Sun, 04 Jun 2006) | 1 line Remove xmlrpc/ directory ........ r46633 | andrew.kuchling | 2006-06-04 01:51:21 +0200 (Sun, 04 Jun 2006) | 1 line Remove dangling reference ........ r46634 | andrew.kuchling | 2006-06-04 01:59:36 +0200 (Sun, 04 Jun 2006) | 1 line Add more whitespace; use a better socket name ........ r46635 | tim.peters | 2006-06-04 03:22:53 +0200 (Sun, 04 Jun 2006) | 2 lines Whitespace normalization. ........ r46637 | tim.peters | 2006-06-04 05:26:02 +0200 (Sun, 04 Jun 2006) | 16 lines In a PYMALLOC_DEBUG build obmalloc adds extra debugging info to each allocated block. This was using 4 bytes for each such piece of info regardless of platform. This didn't really matter before (proof: no bug reports, and the debug-build obmalloc would have assert-failed if it was ever asked for a chunk of memory >= 2**32 bytes), since container indices were plain ints. But after the Py_ssize_t changes, it's at least theoretically possible to allocate a list or string whose guts exceed 2**32 bytes, and the PYMALLOC_DEBUG routines would fail then (having only 4 bytes to record the originally requested size). Now we use sizeof(size_t) bytes for each of a PYMALLOC_DEBUG build's extra debugging fields. This won't make any difference on 32-bit boxes, but will add 16 bytes to each allocation in a debug build on a 64-bit box. ........ r46638 | tim.peters | 2006-06-04 05:38:04 +0200 (Sun, 04 Jun 2006) | 4 lines _PyObject_DebugMalloc(): The return value should add 2*sizeof(size_t) now, not 8. This probably accounts for current disasters on the 64-bit buildbot slaves. ........ r46639 | neal.norwitz | 2006-06-04 08:19:31 +0200 (Sun, 04 Jun 2006) | 1 line SF #1499797, Fix for memory leak in WindowsError_str ........ r46640 | andrew.macintyre | 2006-06-04 14:31:09 +0200 (Sun, 04 Jun 2006) | 2 lines Patch #1454481: Make thread stack size runtime tunable. ........ r46641 | andrew.macintyre | 2006-06-04 14:59:59 +0200 (Sun, 04 Jun 2006) | 2 lines clean up function declarations to conform to PEP-7 style. ........ r46642 | martin.blais | 2006-06-04 15:49:49 +0200 (Sun, 04 Jun 2006) | 15 lines Fixes in struct and socket from merge reviews. - Following Guido's comments, renamed * pack_to -> pack_into * recv_buf -> recv_into * recvfrom_buf -> recvfrom_into - Made fixes to _struct.c according to Neal Norwitz comments on the checkins list. - Converted some ints into the appropriate -- I hope -- ssize_t and size_t. ........ r46643 | ronald.oussoren | 2006-06-04 16:05:28 +0200 (Sun, 04 Jun 2006) | 3 lines "Import" LDFLAGS in Mac/OSX/Makefile.in to ensure pythonw gets build with the right compiler flags. ........ r46644 | ronald.oussoren | 2006-06-04 16:24:59 +0200 (Sun, 04 Jun 2006) | 2 lines Drop Mac wrappers for the WASTE library. ........ r46645 | tim.peters | 2006-06-04 17:49:07 +0200 (Sun, 04 Jun 2006) | 3 lines s_methods[]: Stop compiler warnings by casting s_unpack_from to PyCFunction. ........ r46646 | george.yoshida | 2006-06-04 19:04:12 +0200 (Sun, 04 Jun 2006) | 2 lines Remove a redundant word ........ r46647 | george.yoshida | 2006-06-04 19:17:25 +0200 (Sun, 04 Jun 2006) | 2 lines Markup fix ........ r46648 | martin.v.loewis | 2006-06-04 21:36:28 +0200 (Sun, 04 Jun 2006) | 2 lines Patch #1359618: Speed-up charmap encoder. ........ r46649 | georg.brandl | 2006-06-04 23:46:16 +0200 (Sun, 04 Jun 2006) | 3 lines Repair refleaks in unicodeobject. ........ r46650 | georg.brandl | 2006-06-04 23:56:52 +0200 (Sun, 04 Jun 2006) | 4 lines Patch #1346214: correctly optimize away "if 0"-style stmts (thanks to Neal for review) ........ r46651 | georg.brandl | 2006-06-05 00:15:37 +0200 (Mon, 05 Jun 2006) | 2 lines Bug #1500293: fix memory leaks in _subprocess module. ........ r46654 | tim.peters | 2006-06-05 01:43:53 +0200 (Mon, 05 Jun 2006) | 2 lines Whitespace normalization. ........ r46655 | tim.peters | 2006-06-05 01:52:47 +0200 (Mon, 05 Jun 2006) | 16 lines Revert revisions: 46640 Patch #1454481: Make thread stack size runtime tunable. 46647 Markup fix The first is causing many buildbots to fail test runs, and there are multiple causes with seemingly no immediate prospects for repairing them. See python-dev discussion. Note that a branch can (and should) be created for resolving these problems, like svn copy svn+ssh://svn.python.org/python/trunk -r46640 svn+ssh://svn.python.org/python/branches/NEW_BRANCH followed by merging rev 46647 to the new branch. ........ r46656 | andrew.kuchling | 2006-06-05 02:08:09 +0200 (Mon, 05 Jun 2006) | 1 line Mention second encoding speedup ........ r46657 | gregory.p.smith | 2006-06-05 02:31:01 +0200 (Mon, 05 Jun 2006) | 7 lines bugfix: when log_archive was called with the DB_ARCH_REMOVE flag present in BerkeleyDB >= 4.2 it tried to construct a list out of an uninitialized char **log_list. feature: export the DB_ARCH_REMOVE flag by name in the module on BerkeleyDB >= 4.2. ........ r46658 | gregory.p.smith | 2006-06-05 02:33:35 +0200 (Mon, 05 Jun 2006) | 5 lines fix a bug in the previous commit. don't leak empty list on error return and fix the additional rare (out of memory only) bug that it was supposed to fix of not freeing log_list when the python allocator failed. ........ r46660 | tim.peters | 2006-06-05 02:55:26 +0200 (Mon, 05 Jun 2006) | 9 lines "Flat is better than nested." Move the long-winded, multiply-nested -R support out of runtest() and into some module-level helper functions. This makes runtest() and the -R code easier to follow. That in turn allowed seeing some opportunities for code simplification, and made it obvious that reglog.txt never got closed. ........ r46661 | hyeshik.chang | 2006-06-05 02:59:54 +0200 (Mon, 05 Jun 2006) | 3 lines Fix a potentially invalid memory access of CJKCodecs' shift-jis decoder. (found by Neal Norwitz) ........ r46663 | gregory.p.smith | 2006-06-05 03:39:52 +0200 (Mon, 05 Jun 2006) | 3 lines * support DBEnv.log_stat() method on BerkeleyDB >= 4.0 [patch #1494885] ........ r46664 | tim.peters | 2006-06-05 03:43:03 +0200 (Mon, 05 Jun 2006) | 3 lines Remove doctest.testmod's deprecated (in 2.4) `isprivate` argument. A lot of hair went into supporting that! ........ r46665 | tim.peters | 2006-06-05 03:47:24 +0200 (Mon, 05 Jun 2006) | 2 lines Whitespace normalization. ........ r46666 | tim.peters | 2006-06-05 03:48:21 +0200 (Mon, 05 Jun 2006) | 2 lines Make doctest news more accurate. ........ r46667 | gregory.p.smith | 2006-06-05 03:56:15 +0200 (Mon, 05 Jun 2006) | 3 lines * support DBEnv.lsn_reset() method on BerkeleyDB >= 4.4 [patch #1494902] ........ r46668 | gregory.p.smith | 2006-06-05 04:02:25 +0200 (Mon, 05 Jun 2006) | 3 lines mention the just committed bsddb changes ........ r46671 | gregory.p.smith | 2006-06-05 19:38:04 +0200 (Mon, 05 Jun 2006) | 3 lines * add support for DBSequence objects [patch #1466734] ........ r46672 | gregory.p.smith | 2006-06-05 20:20:07 +0200 (Mon, 05 Jun 2006) | 3 lines forgot to add this file in previous commit ........ r46673 | tim.peters | 2006-06-05 20:36:12 +0200 (Mon, 05 Jun 2006) | 2 lines Whitespace normalization. ........ r46674 | tim.peters | 2006-06-05 20:36:54 +0200 (Mon, 05 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46675 | gregory.p.smith | 2006-06-05 20:48:21 +0200 (Mon, 05 Jun 2006) | 4 lines * fix DBCursor.pget() bug with keyword argument names when no data= is supplied [SF pybsddb bug #1477863] ........ r46676 | andrew.kuchling | 2006-06-05 21:05:32 +0200 (Mon, 05 Jun 2006) | 1 line Remove use of Trove name, which isn't very helpful to users ........ r46677 | andrew.kuchling | 2006-06-05 21:08:25 +0200 (Mon, 05 Jun 2006) | 1 line [Bug #1470026] Include link to list of classifiers ........ r46679 | tim.peters | 2006-06-05 22:48:49 +0200 (Mon, 05 Jun 2006) | 10 lines Access _struct attributes directly instead of mucking with getattr. string_reverse(): Simplify. assertRaises(): Raise TestFailed on failure. test_unpack_from(), test_pack_into(), test_pack_into_fn(): never use `assert` to test for an expected result (it doesn't test anything when Python is run with -O). ........ r46680 | tim.peters | 2006-06-05 22:49:27 +0200 (Mon, 05 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46681 | gregory.p.smith | 2006-06-06 01:38:06 +0200 (Tue, 06 Jun 2006) | 3 lines add depends = ['md5.h'] to the _md5 module extension for correctness sake. ........ r46682 | brett.cannon | 2006-06-06 01:51:55 +0200 (Tue, 06 Jun 2006) | 4 lines Add 3 more bytes to a buffer to cover constants in string and null byte on top of 10 possible digits for an int. Closes bug #1501223. ........ r46684 | gregory.p.smith | 2006-06-06 01:59:37 +0200 (Tue, 06 Jun 2006) | 5 lines - bsddb: the __len__ method of a DB object has been fixed to return correct results. It could previously incorrectly return 0 in some cases. Fixes SF bug 1493322 (pybsddb bug 1184012). ........ r46686 | tim.peters | 2006-06-06 02:25:07 +0200 (Tue, 06 Jun 2006) | 7 lines _PySys_Init(): It's rarely a good idea to size a buffer to the exact maximum size someone guesses is needed. In this case, if we're really worried about extreme integers, then "cp%d" can actually need 14 bytes (2 for "cp" + 1 for \0 at the end + 11 for -(2**31-1)). So reserve 128 bytes instead -- nothing is actually saved by making a stack-local buffer tiny. ........ r46687 | neal.norwitz | 2006-06-06 09:22:08 +0200 (Tue, 06 Jun 2006) | 1 line Remove unused variable (and stop compiler warning) ........ r46688 | neal.norwitz | 2006-06-06 09:23:01 +0200 (Tue, 06 Jun 2006) | 1 line Fix a bunch of parameter strings ........ r46689 | thomas.heller | 2006-06-06 13:34:33 +0200 (Tue, 06 Jun 2006) | 6 lines Convert CFieldObject tp_members to tp_getset, since there is no structmember typecode for Py_ssize_t fields. This should fix some of the errors on the PPC64 debian machine (64-bit, big endian). Assigning to readonly fields now raises AttributeError instead of TypeError, so the testcase has to be changed as well. ........ r46690 | thomas.heller | 2006-06-06 13:54:32 +0200 (Tue, 06 Jun 2006) | 1 line Damn - the sentinel was missing. And fix another silly mistake. ........ r46691 | martin.blais | 2006-06-06 14:46:55 +0200 (Tue, 06 Jun 2006) | 13 lines Normalized a few cases of whitespace in function declarations. Found them using:: find . -name '*.py' | while read i ; do grep 'def[^(]*( ' $i /dev/null ; done find . -name '*.py' | while read i ; do grep ' ):' $i /dev/null ; done (I was doing this all over my own code anyway, because I'd been using spaces in all defs, so I thought I'd make a run on the Python code as well. If you need to do such fixes in your own code, you can use xx-rename or parenregu.el within emacs.) ........ r46693 | thomas.heller | 2006-06-06 17:34:18 +0200 (Tue, 06 Jun 2006) | 1 line Specify argtypes for all test functions. Maybe that helps on strange ;-) architectures ........ r46694 | tim.peters | 2006-06-06 17:50:17 +0200 (Tue, 06 Jun 2006) | 5 lines BSequence_set_range(): Rev 46688 ("Fix a bunch of parameter strings") changed this function's signature seemingly by mistake, which is causing buildbots to fail test_bsddb3. Restored the pre-46688 signature. ........ r46695 | tim.peters | 2006-06-06 17:52:35 +0200 (Tue, 06 Jun 2006) | 4 lines On python-dev Thomas Heller said these were committed by mistake in rev 46693, so reverting this part of rev 46693. ........ r46696 | andrew.kuchling | 2006-06-06 19:10:41 +0200 (Tue, 06 Jun 2006) | 1 line Fix comment typo ........ r46697 | brett.cannon | 2006-06-06 20:08:16 +0200 (Tue, 06 Jun 2006) | 2 lines Fix coding style guide bug. ........ r46698 | thomas.heller | 2006-06-06 20:50:46 +0200 (Tue, 06 Jun 2006) | 2 lines Add a hack so that foreign functions returning float now do work on 64-bit big endian platforms. ........ r46699 | thomas.heller | 2006-06-06 21:25:13 +0200 (Tue, 06 Jun 2006) | 3 lines Use the same big-endian hack as in _ctypes/callproc.c for callback functions. This fixes the callback function tests that return float. ........ r46700 | ronald.oussoren | 2006-06-06 21:50:24 +0200 (Tue, 06 Jun 2006) | 5 lines * Ensure that "make altinstall" works when the tree was configured with --enable-framework * Also for --enable-framework: allow users to use --prefix to specify the location of the compatibility symlinks (such as /usr/local/bin/python) ........ r46701 | ronald.oussoren | 2006-06-06 21:56:00 +0200 (Tue, 06 Jun 2006) | 3 lines A quick hack to ensure the right key-bindings for IDLE on osx: install patched configuration files during a framework install. ........ r46702 | tim.peters | 2006-06-07 03:04:59 +0200 (Wed, 07 Jun 2006) | 4 lines dash_R_cleanup(): Clear filecmp._cache. This accounts for different results across -R runs (at least on Windows) of test_filecmp. ........ r46705 | tim.peters | 2006-06-07 08:57:51 +0200 (Wed, 07 Jun 2006) | 17 lines SF patch 1501987: Remove randomness from test_exceptions, from ?iga Seilnacht (sorry about the name, but Firefox on my box can't display the first character of the name -- the SF "Unix name" is zseil). This appears to cure the oddball intermittent leaks across runs when running test_exceptions under -R. I'm not sure why, but I'm too sleepy to care ;-) The thrust of the SF patch was to remove randomness in the pickle protocol used. I changed the patch to use range(pickle.HIGHEST_PROTOCOL + 1), to try both pickle and cPickle, and randomly mucked with other test lines to put statements on their own lines. Not a bugfix candidate (this is fiddling new-in-2.5 code). ........ r46706 | andrew.kuchling | 2006-06-07 15:55:33 +0200 (Wed, 07 Jun 2006) | 1 line Add an SQLite introduction, taken from the 'What's New' text ........ r46708 | andrew.kuchling | 2006-06-07 19:02:52 +0200 (Wed, 07 Jun 2006) | 1 line Mention other placeholders ........ r46709 | andrew.kuchling | 2006-06-07 19:03:46 +0200 (Wed, 07 Jun 2006) | 1 line Add an item; also, escape % ........ r46710 | andrew.kuchling | 2006-06-07 19:04:01 +0200 (Wed, 07 Jun 2006) | 1 line Mention other placeholders ........ r46716 | ronald.oussoren | 2006-06-07 20:57:44 +0200 (Wed, 07 Jun 2006) | 2 lines Move Mac/OSX/Tools one level up ........ r46717 | ronald.oussoren | 2006-06-07 20:58:01 +0200 (Wed, 07 Jun 2006) | 2 lines Move Mac/OSX/PythonLauncher one level up ........ r46718 | ronald.oussoren | 2006-06-07 20:58:42 +0200 (Wed, 07 Jun 2006) | 2 lines mv Mac/OSX/BuildScript one level up ........ r46719 | ronald.oussoren | 2006-06-07 21:02:03 +0200 (Wed, 07 Jun 2006) | 2 lines Move Mac/OSX/* one level up ........ r46720 | ronald.oussoren | 2006-06-07 21:06:01 +0200 (Wed, 07 Jun 2006) | 2 lines And the last bit: move IDLE one level up and adjust makefiles ........ r46723 | ronald.oussoren | 2006-06-07 21:38:53 +0200 (Wed, 07 Jun 2006) | 4 lines - Patch the correct version of python in the Info.plists at build time, instead of relying on a maintainer to update them before releases. - Remove the now empty Mac/OSX directory ........ r46727 | ronald.oussoren | 2006-06-07 22:18:44 +0200 (Wed, 07 Jun 2006) | 7 lines * If BuildApplet.py is used as an applet it starts with a version of sys.exutable that isn't usuable on an #!-line. That results in generated applets that don't actually work. Work around this problem by resetting sys.executable. * argvemulator.py didn't work on intel macs. This patch fixes this (bug #1491468) ........ r46728 | tim.peters | 2006-06-07 22:40:06 +0200 (Wed, 07 Jun 2006) | 2 lines Whitespace normalization. ........ r46729 | tim.peters | 2006-06-07 22:40:54 +0200 (Wed, 07 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46730 | thomas.heller | 2006-06-07 22:43:06 +0200 (Wed, 07 Jun 2006) | 7 lines Fix for foreign functions returning small structures on 64-bit big endian machines. Should fix the remaininf failure in the PPC64 Debian buildbot. Thanks to Matthias Klose for providing access to a machine to debug and test this. ........ r46731 | brett.cannon | 2006-06-07 23:48:17 +0200 (Wed, 07 Jun 2006) | 2 lines Clarify documentation for bf_getcharbuffer. ........ r46735 | neal.norwitz | 2006-06-08 07:12:45 +0200 (Thu, 08 Jun 2006) | 1 line Fix a refleak in recvfrom_into ........ r46736 | gregory.p.smith | 2006-06-08 07:17:08 +0200 (Thu, 08 Jun 2006) | 9 lines - bsddb: the bsddb.dbtables Modify method now raises the proper error and aborts the db transaction safely when a modifier callback fails. Fixes SF python patch/bug #1408584. Also cleans up the bsddb.dbtables docstrings since thats the only documentation that exists for that unadvertised module. (people really should really just use sqlite3) ........ r46737 | gregory.p.smith | 2006-06-08 07:38:11 +0200 (Thu, 08 Jun 2006) | 4 lines * Turn the deadlock situation described in SF bug #775414 into a DBDeadLockError exception. * add the test case for my previous dbtables commit. ........ r46738 | gregory.p.smith | 2006-06-08 07:39:54 +0200 (Thu, 08 Jun 2006) | 2 lines pasted set_lk_detect line in wrong spot in previous commit. fixed. passes tests this time. ........ r46739 | armin.rigo | 2006-06-08 12:56:24 +0200 (Thu, 08 Jun 2006) | 6 lines (arre, arigo) SF bug #1350060 Give a consistent behavior for comparison and hashing of method objects (both user- and built-in methods). Now compares the 'self' recursively. The hash was already asking for the hash of 'self'. ........ r46740 | andrew.kuchling | 2006-06-08 13:56:44 +0200 (Thu, 08 Jun 2006) | 1 line Typo fix ........ r46741 | georg.brandl | 2006-06-08 14:45:01 +0200 (Thu, 08 Jun 2006) | 2 lines Bug #1502750: Fix getargs "i" format to use LONG_MIN and LONG_MAX for bounds checking. ........ r46743 | georg.brandl | 2006-06-08 14:54:13 +0200 (Thu, 08 Jun 2006) | 2 lines Bug #1502728: Correctly link against librt library on HP-UX. ........ r46745 | georg.brandl | 2006-06-08 14:55:47 +0200 (Thu, 08 Jun 2006) | 3 lines Add news for recent bugfix. ........ r46746 | georg.brandl | 2006-06-08 15:31:07 +0200 (Thu, 08 Jun 2006) | 4 lines Argh. "integer" is a very confusing word ;) Actually, checking for INT_MAX and INT_MIN is correct since the format code explicitly handles a C "int". ........ r46748 | nick.coghlan | 2006-06-08 15:54:49 +0200 (Thu, 08 Jun 2006) | 1 line Add functools.update_wrapper() and functools.wraps() as described in PEP 356 ........ r46751 | georg.brandl | 2006-06-08 16:50:21 +0200 (Thu, 08 Jun 2006) | 4 lines Bug #1502805: don't alias file.__exit__ to file.close since the latter can return something that's true. ........ r46752 | georg.brandl | 2006-06-08 16:50:53 +0200 (Thu, 08 Jun 2006) | 3 lines Convert test_file to unittest. ........
		
			
				
	
	
		
			1301 lines
		
	
	
	
		
			38 KiB
		
	
	
	
		
			Python
		
	
	
		
			Executable file
		
	
	
	
	
			
		
		
	
	
			1301 lines
		
	
	
	
		
			38 KiB
		
	
	
	
		
			Python
		
	
	
		
			Executable file
		
	
	
	
	
| #! /usr/bin/env python
 | |
| 
 | |
| """Regression test.
 | |
| 
 | |
| This will find all modules whose name is "test_*" in the test
 | |
| directory, and run them.  Various command line options provide
 | |
| additional facilities.
 | |
| 
 | |
| Command line options:
 | |
| 
 | |
| -v: verbose    -- run tests in verbose mode with output to stdout
 | |
| -w: verbose2   -- re-run failed tests in verbose mode
 | |
| -q: quiet      -- don't print anything except if a test fails
 | |
| -g: generate   -- write the output file for a test instead of comparing it
 | |
| -x: exclude    -- arguments are tests to *exclude*
 | |
| -s: single     -- run only a single test (see below)
 | |
| -r: random     -- randomize test execution order
 | |
| -f: fromfile   -- read names of tests to run from a file (see below)
 | |
| -l: findleaks  -- if GC is available detect tests that leak memory
 | |
| -u: use        -- specify which special resource intensive tests to run
 | |
| -h: help       -- print this text and exit
 | |
| -t: threshold  -- call gc.set_threshold(N)
 | |
| -T: coverage   -- turn on code coverage using the trace module
 | |
| -D: coverdir   -- Directory where coverage files are put
 | |
| -N: nocoverdir -- Put coverage files alongside modules
 | |
| -L: runleaks   -- run the leaks(1) command just before exit
 | |
| -R: huntrleaks -- search for reference leaks (needs debug build, v. slow)
 | |
| -M: memlimit   -- run very large memory-consuming tests
 | |
| 
 | |
| If non-option arguments are present, they are names for tests to run,
 | |
| unless -x is given, in which case they are names for tests not to run.
 | |
| If no test names are given, all tests are run.
 | |
| 
 | |
| -v is incompatible with -g and does not compare test output files.
 | |
| 
 | |
| -T turns on code coverage tracing with the trace module.
 | |
| 
 | |
| -D specifies the directory where coverage files are put.
 | |
| 
 | |
| -N Put coverage files alongside modules.
 | |
| 
 | |
| -s means to run only a single test and exit.  This is useful when
 | |
| doing memory analysis on the Python interpreter (which tend to consume
 | |
| too many resources to run the full regression test non-stop).  The
 | |
| file /tmp/pynexttest is read to find the next test to run.  If this
 | |
| file is missing, the first test_*.py file in testdir or on the command
 | |
| line is used.  (actually tempfile.gettempdir() is used instead of
 | |
| /tmp).
 | |
| 
 | |
| -f reads the names of tests from the file given as f's argument, one
 | |
| or more test names per line.  Whitespace is ignored.  Blank lines and
 | |
| lines beginning with '#' are ignored.  This is especially useful for
 | |
| whittling down failures involving interactions among tests.
 | |
| 
 | |
| -L causes the leaks(1) command to be run just before exit if it exists.
 | |
| leaks(1) is available on Mac OS X and presumably on some other
 | |
| FreeBSD-derived systems.
 | |
| 
 | |
| -R runs each test several times and examines sys.gettotalrefcount() to
 | |
| see if the test appears to be leaking references.  The argument should
 | |
| be of the form stab:run:fname where 'stab' is the number of times the
 | |
| test is run to let gettotalrefcount settle down, 'run' is the number
 | |
| of times further it is run and 'fname' is the name of the file the
 | |
| reports are written to.  These parameters all have defaults (5, 4 and
 | |
| "reflog.txt" respectively), so the minimal invocation is '-R ::'.
 | |
| 
 | |
| -M runs tests that require an exorbitant amount of memory. These tests
 | |
| typically try to ascertain containers keep working when containing more than
 | |
| 2 bilion objects, and only work on 64-bit systems. The passed-in memlimit,
 | |
| which is a string in the form of '2.5Gb', determines howmuch memory the
 | |
| tests will limit themselves to (but they may go slightly over.) The number
 | |
| shouldn't be more memory than the machine has (including swap memory). You
 | |
| should also keep in mind that swap memory is generally much, much slower
 | |
| than RAM, and setting memlimit to all available RAM or higher will heavily
 | |
| tax the machine. On the other hand, it is no use running these tests with a
 | |
| limit of less than 2.5Gb, and many require more than 20Gb. Tests that expect
 | |
| to use more than memlimit memory will be skipped. The big-memory tests
 | |
| generally run very, very long.
 | |
| 
 | |
| -u is used to specify which special resource intensive tests to run,
 | |
| such as those requiring large file support or network connectivity.
 | |
| The argument is a comma-separated list of words indicating the
 | |
| resources to test.  Currently only the following are defined:
 | |
| 
 | |
|     all -       Enable all special resources.
 | |
| 
 | |
|     audio -     Tests that use the audio device.  (There are known
 | |
|                 cases of broken audio drivers that can crash Python or
 | |
|                 even the Linux kernel.)
 | |
| 
 | |
|     curses -    Tests that use curses and will modify the terminal's
 | |
|                 state and output modes.
 | |
| 
 | |
|     largefile - It is okay to run some test that may create huge
 | |
|                 files.  These tests can take a long time and may
 | |
|                 consume >2GB of disk space temporarily.
 | |
| 
 | |
|     network -   It is okay to run tests that use external network
 | |
|                 resource, e.g. testing SSL support for sockets.
 | |
| 
 | |
|     bsddb -     It is okay to run the bsddb testsuite, which takes
 | |
|                 a long time to complete.
 | |
| 
 | |
|     decimal -   Test the decimal module against a large suite that
 | |
|                 verifies compliance with standards.
 | |
| 
 | |
|     compiler -  Test the compiler package by compiling all the source
 | |
|                 in the standard library and test suite.  This takes
 | |
|                 a long time.  Enabling this resource also allows
 | |
|                 test_tokenize to verify round-trip lexing on every
 | |
|                 file in the test library.
 | |
| 
 | |
|     subprocess  Run all tests for the subprocess module.
 | |
| 
 | |
|     urlfetch -  It is okay to download files required on testing.
 | |
| 
 | |
| To enable all resources except one, use '-uall,-<resource>'.  For
 | |
| example, to run all the tests except for the bsddb tests, give the
 | |
| option '-uall,-bsddb'.
 | |
| """
 | |
| 
 | |
| import os
 | |
| import sys
 | |
| import getopt
 | |
| import random
 | |
| import warnings
 | |
| import re
 | |
| import cStringIO
 | |
| import traceback
 | |
| 
 | |
| # I see no other way to suppress these warnings;
 | |
| # putting them in test_grammar.py has no effect:
 | |
| warnings.filterwarnings("ignore", "hex/oct constants", FutureWarning,
 | |
|                         ".*test.test_grammar$")
 | |
| if sys.maxint > 0x7fffffff:
 | |
|     # Also suppress them in <string>, because for 64-bit platforms,
 | |
|     # that's where test_grammar.py hides them.
 | |
|     warnings.filterwarnings("ignore", "hex/oct constants", FutureWarning,
 | |
|                             "<string>")
 | |
| 
 | |
| # Ignore ImportWarnings that only occur in the source tree,
 | |
| # (because of modules with the same name as source-directories in Modules/)
 | |
| for mod in ("ctypes", "gzip", "zipfile", "tarfile", "encodings.zlib_codec",
 | |
|             "test.test_zipimport", "test.test_zlib", "test.test_zipfile",
 | |
|             "test.test_codecs", "test.string_tests"):
 | |
|     warnings.filterwarnings(module=".*%s$" % (mod,),
 | |
|                             action="ignore", category=ImportWarning)
 | |
| 
 | |
| # MacOSX (a.k.a. Darwin) has a default stack size that is too small
 | |
| # for deeply recursive regular expressions.  We see this as crashes in
 | |
| # the Python test suite when running test_re.py and test_sre.py.  The
 | |
| # fix is to set the stack limit to 2048.
 | |
| # This approach may also be useful for other Unixy platforms that
 | |
| # suffer from small default stack limits.
 | |
| if sys.platform == 'darwin':
 | |
|     try:
 | |
|         import resource
 | |
|     except ImportError:
 | |
|         pass
 | |
|     else:
 | |
|         soft, hard = resource.getrlimit(resource.RLIMIT_STACK)
 | |
|         newsoft = min(hard, max(soft, 1024*2048))
 | |
|         resource.setrlimit(resource.RLIMIT_STACK, (newsoft, hard))
 | |
| 
 | |
| from test import test_support
 | |
| 
 | |
| RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network', 'bsddb',
 | |
|                   'decimal', 'compiler', 'subprocess', 'urlfetch')
 | |
| 
 | |
| 
 | |
| def usage(code, msg=''):
 | |
|     print __doc__
 | |
|     if msg: print msg
 | |
|     sys.exit(code)
 | |
| 
 | |
| 
 | |
| def main(tests=None, testdir=None, verbose=0, quiet=False, generate=False,
 | |
|          exclude=False, single=False, randomize=False, fromfile=None,
 | |
|          findleaks=False, use_resources=None, trace=False, coverdir='coverage',
 | |
|          runleaks=False, huntrleaks=False, verbose2=False):
 | |
|     """Execute a test suite.
 | |
| 
 | |
|     This also parses command-line options and modifies its behavior
 | |
|     accordingly.
 | |
| 
 | |
|     tests -- a list of strings containing test names (optional)
 | |
|     testdir -- the directory in which to look for tests (optional)
 | |
| 
 | |
|     Users other than the Python test suite will certainly want to
 | |
|     specify testdir; if it's omitted, the directory containing the
 | |
|     Python test suite is searched for.
 | |
| 
 | |
|     If the tests argument is omitted, the tests listed on the
 | |
|     command-line will be used.  If that's empty, too, then all *.py
 | |
|     files beginning with test_ will be used.
 | |
| 
 | |
|     The other default arguments (verbose, quiet, generate, exclude, single,
 | |
|     randomize, findleaks, use_resources, trace and coverdir) allow programmers
 | |
|     calling main() directly to set the values that would normally be set by
 | |
|     flags on the command line.
 | |
|     """
 | |
| 
 | |
|     test_support.record_original_stdout(sys.stdout)
 | |
|     try:
 | |
|         opts, args = getopt.getopt(sys.argv[1:], 'hvgqxsrf:lu:t:TD:NLR:wM:',
 | |
|                                    ['help', 'verbose', 'quiet', 'generate',
 | |
|                                     'exclude', 'single', 'random', 'fromfile',
 | |
|                                     'findleaks', 'use=', 'threshold=', 'trace',
 | |
|                                     'coverdir=', 'nocoverdir', 'runleaks',
 | |
|                                     'huntrleaks=', 'verbose2', 'memlimit=',
 | |
|                                     ])
 | |
|     except getopt.error, msg:
 | |
|         usage(2, msg)
 | |
| 
 | |
|     # Defaults
 | |
|     if use_resources is None:
 | |
|         use_resources = []
 | |
|     for o, a in opts:
 | |
|         if o in ('-h', '--help'):
 | |
|             usage(0)
 | |
|         elif o in ('-v', '--verbose'):
 | |
|             verbose += 1
 | |
|         elif o in ('-w', '--verbose2'):
 | |
|             verbose2 = True
 | |
|         elif o in ('-q', '--quiet'):
 | |
|             quiet = True;
 | |
|             verbose = 0
 | |
|         elif o in ('-g', '--generate'):
 | |
|             generate = True
 | |
|         elif o in ('-x', '--exclude'):
 | |
|             exclude = True
 | |
|         elif o in ('-s', '--single'):
 | |
|             single = True
 | |
|         elif o in ('-r', '--randomize'):
 | |
|             randomize = True
 | |
|         elif o in ('-f', '--fromfile'):
 | |
|             fromfile = a
 | |
|         elif o in ('-l', '--findleaks'):
 | |
|             findleaks = True
 | |
|         elif o in ('-L', '--runleaks'):
 | |
|             runleaks = True
 | |
|         elif o in ('-t', '--threshold'):
 | |
|             import gc
 | |
|             gc.set_threshold(int(a))
 | |
|         elif o in ('-T', '--coverage'):
 | |
|             trace = True
 | |
|         elif o in ('-D', '--coverdir'):
 | |
|             coverdir = os.path.join(os.getcwd(), a)
 | |
|         elif o in ('-N', '--nocoverdir'):
 | |
|             coverdir = None
 | |
|         elif o in ('-R', '--huntrleaks'):
 | |
|             huntrleaks = a.split(':')
 | |
|             if len(huntrleaks) != 3:
 | |
|                 print a, huntrleaks
 | |
|                 usage(2, '-R takes three colon-separated arguments')
 | |
|             if len(huntrleaks[0]) == 0:
 | |
|                 huntrleaks[0] = 5
 | |
|             else:
 | |
|                 huntrleaks[0] = int(huntrleaks[0])
 | |
|             if len(huntrleaks[1]) == 0:
 | |
|                 huntrleaks[1] = 4
 | |
|             else:
 | |
|                 huntrleaks[1] = int(huntrleaks[1])
 | |
|             if len(huntrleaks[2]) == 0:
 | |
|                 huntrleaks[2] = "reflog.txt"
 | |
|         elif o in ('-M', '--memlimit'):
 | |
|             test_support.set_memlimit(a)
 | |
|         elif o in ('-u', '--use'):
 | |
|             u = [x.lower() for x in a.split(',')]
 | |
|             for r in u:
 | |
|                 if r == 'all':
 | |
|                     use_resources[:] = RESOURCE_NAMES
 | |
|                     continue
 | |
|                 remove = False
 | |
|                 if r[0] == '-':
 | |
|                     remove = True
 | |
|                     r = r[1:]
 | |
|                 if r not in RESOURCE_NAMES:
 | |
|                     usage(1, 'Invalid -u/--use option: ' + a)
 | |
|                 if remove:
 | |
|                     if r in use_resources:
 | |
|                         use_resources.remove(r)
 | |
|                 elif r not in use_resources:
 | |
|                     use_resources.append(r)
 | |
|     if generate and verbose:
 | |
|         usage(2, "-g and -v don't go together!")
 | |
|     if single and fromfile:
 | |
|         usage(2, "-s and -f don't go together!")
 | |
| 
 | |
|     good = []
 | |
|     bad = []
 | |
|     skipped = []
 | |
|     resource_denieds = []
 | |
| 
 | |
|     if findleaks:
 | |
|         try:
 | |
|             import gc
 | |
|         except ImportError:
 | |
|             print 'No GC available, disabling findleaks.'
 | |
|             findleaks = False
 | |
|         else:
 | |
|             # Uncomment the line below to report garbage that is not
 | |
|             # freeable by reference counting alone.  By default only
 | |
|             # garbage that is not collectable by the GC is reported.
 | |
|             #gc.set_debug(gc.DEBUG_SAVEALL)
 | |
|             found_garbage = []
 | |
| 
 | |
|     if single:
 | |
|         from tempfile import gettempdir
 | |
|         filename = os.path.join(gettempdir(), 'pynexttest')
 | |
|         try:
 | |
|             fp = open(filename, 'r')
 | |
|             next = fp.read().strip()
 | |
|             tests = [next]
 | |
|             fp.close()
 | |
|         except IOError:
 | |
|             pass
 | |
| 
 | |
|     if fromfile:
 | |
|         tests = []
 | |
|         fp = open(fromfile)
 | |
|         for line in fp:
 | |
|             guts = line.split() # assuming no test has whitespace in its name
 | |
|             if guts and not guts[0].startswith('#'):
 | |
|                 tests.extend(guts)
 | |
|         fp.close()
 | |
| 
 | |
|     # Strip .py extensions.
 | |
|     if args:
 | |
|         args = map(removepy, args)
 | |
|     if tests:
 | |
|         tests = map(removepy, tests)
 | |
| 
 | |
|     stdtests = STDTESTS[:]
 | |
|     nottests = NOTTESTS[:]
 | |
|     if exclude:
 | |
|         for arg in args:
 | |
|             if arg in stdtests:
 | |
|                 stdtests.remove(arg)
 | |
|         nottests[:0] = args
 | |
|         args = []
 | |
|     tests = tests or args or findtests(testdir, stdtests, nottests)
 | |
|     if single:
 | |
|         tests = tests[:1]
 | |
|     if randomize:
 | |
|         random.shuffle(tests)
 | |
|     if trace:
 | |
|         import trace
 | |
|         tracer = trace.Trace(ignoredirs=[sys.prefix, sys.exec_prefix],
 | |
|                              trace=False, count=True)
 | |
|     test_support.verbose = verbose      # Tell tests to be moderately quiet
 | |
|     test_support.use_resources = use_resources
 | |
|     save_modules = sys.modules.keys()
 | |
|     for test in tests:
 | |
|         if not quiet:
 | |
|             print test
 | |
|             sys.stdout.flush()
 | |
|         if trace:
 | |
|             # If we're tracing code coverage, then we don't exit with status
 | |
|             # if on a false return value from main.
 | |
|             tracer.runctx('runtest(test, generate, verbose, quiet, testdir)',
 | |
|                           globals=globals(), locals=vars())
 | |
|         else:
 | |
|             try:
 | |
|                 ok = runtest(test, generate, verbose, quiet, testdir,
 | |
|                              huntrleaks)
 | |
|             except KeyboardInterrupt:
 | |
|                 # print a newline separate from the ^C
 | |
|                 print
 | |
|                 break
 | |
|             except:
 | |
|                 raise
 | |
|             if ok > 0:
 | |
|                 good.append(test)
 | |
|             elif ok == 0:
 | |
|                 bad.append(test)
 | |
|             else:
 | |
|                 skipped.append(test)
 | |
|                 if ok == -2:
 | |
|                     resource_denieds.append(test)
 | |
|         if findleaks:
 | |
|             gc.collect()
 | |
|             if gc.garbage:
 | |
|                 print "Warning: test created", len(gc.garbage),
 | |
|                 print "uncollectable object(s)."
 | |
|                 # move the uncollectable objects somewhere so we don't see
 | |
|                 # them again
 | |
|                 found_garbage.extend(gc.garbage)
 | |
|                 del gc.garbage[:]
 | |
|         # Unload the newly imported modules (best effort finalization)
 | |
|         for module in sys.modules.keys():
 | |
|             if module not in save_modules and module.startswith("test."):
 | |
|                 test_support.unload(module)
 | |
| 
 | |
|     # The lists won't be sorted if running with -r
 | |
|     good.sort()
 | |
|     bad.sort()
 | |
|     skipped.sort()
 | |
| 
 | |
|     if good and not quiet:
 | |
|         if not bad and not skipped and len(good) > 1:
 | |
|             print "All",
 | |
|         print count(len(good), "test"), "OK."
 | |
|         if verbose:
 | |
|             print "CAUTION:  stdout isn't compared in verbose mode:"
 | |
|             print "a test that passes in verbose mode may fail without it."
 | |
|     if bad:
 | |
|         print count(len(bad), "test"), "failed:"
 | |
|         printlist(bad)
 | |
|     if skipped and not quiet:
 | |
|         print count(len(skipped), "test"), "skipped:"
 | |
|         printlist(skipped)
 | |
| 
 | |
|         e = _ExpectedSkips()
 | |
|         plat = sys.platform
 | |
|         if e.isvalid():
 | |
|             surprise = set(skipped) - e.getexpected() - set(resource_denieds)
 | |
|             if surprise:
 | |
|                 print count(len(surprise), "skip"), \
 | |
|                       "unexpected on", plat + ":"
 | |
|                 printlist(surprise)
 | |
|             else:
 | |
|                 print "Those skips are all expected on", plat + "."
 | |
|         else:
 | |
|             print "Ask someone to teach regrtest.py about which tests are"
 | |
|             print "expected to get skipped on", plat + "."
 | |
| 
 | |
|     if verbose2 and bad:
 | |
|         print "Re-running failed tests in verbose mode"
 | |
|         for test in bad:
 | |
|             print "Re-running test %r in verbose mode" % test
 | |
|             sys.stdout.flush()
 | |
|             try:
 | |
|                 test_support.verbose = 1
 | |
|                 ok = runtest(test, generate, 1, quiet, testdir,
 | |
|                              huntrleaks)
 | |
|             except KeyboardInterrupt:
 | |
|                 # print a newline separate from the ^C
 | |
|                 print
 | |
|                 break
 | |
|             except:
 | |
|                 raise
 | |
| 
 | |
|     if single:
 | |
|         alltests = findtests(testdir, stdtests, nottests)
 | |
|         for i in range(len(alltests)):
 | |
|             if tests[0] == alltests[i]:
 | |
|                 if i == len(alltests) - 1:
 | |
|                     os.unlink(filename)
 | |
|                 else:
 | |
|                     fp = open(filename, 'w')
 | |
|                     fp.write(alltests[i+1] + '\n')
 | |
|                     fp.close()
 | |
|                 break
 | |
|         else:
 | |
|             os.unlink(filename)
 | |
| 
 | |
|     if trace:
 | |
|         r = tracer.results()
 | |
|         r.write_results(show_missing=True, summary=True, coverdir=coverdir)
 | |
| 
 | |
|     if runleaks:
 | |
|         os.system("leaks %d" % os.getpid())
 | |
| 
 | |
|     sys.exit(len(bad) > 0)
 | |
| 
 | |
| 
 | |
| STDTESTS = [
 | |
|     'test_grammar',
 | |
|     'test_opcodes',
 | |
|     'test_operations',
 | |
|     'test_builtin',
 | |
|     'test_exceptions',
 | |
|     'test_types',
 | |
|    ]
 | |
| 
 | |
| NOTTESTS = [
 | |
|     'test_support',
 | |
|     'test_future1',
 | |
|     'test_future2',
 | |
|     'test_future3',
 | |
|     ]
 | |
| 
 | |
| def findtests(testdir=None, stdtests=STDTESTS, nottests=NOTTESTS):
 | |
|     """Return a list of all applicable test modules."""
 | |
|     if not testdir: testdir = findtestdir()
 | |
|     names = os.listdir(testdir)
 | |
|     tests = []
 | |
|     for name in names:
 | |
|         if name[:5] == "test_" and name[-3:] == os.extsep+"py":
 | |
|             modname = name[:-3]
 | |
|             if modname not in stdtests and modname not in nottests:
 | |
|                 tests.append(modname)
 | |
|     tests.sort()
 | |
|     return stdtests + tests
 | |
| 
 | |
| def runtest(test, generate, verbose, quiet, testdir=None, huntrleaks=False):
 | |
|     """Run a single test.
 | |
|     test -- the name of the test
 | |
|     generate -- if true, generate output, instead of running the test
 | |
|     and comparing it to a previously created output file
 | |
|     verbose -- if true, print more messages
 | |
|     quiet -- if true, don't print 'skipped' messages (probably redundant)
 | |
|     testdir -- test directory
 | |
|     """
 | |
| 
 | |
|     test_support.unload(test)
 | |
|     if not testdir:
 | |
|         testdir = findtestdir()
 | |
|     outputdir = os.path.join(testdir, "output")
 | |
|     outputfile = os.path.join(outputdir, test)
 | |
|     if verbose:
 | |
|         cfp = None
 | |
|     else:
 | |
|         cfp = cStringIO.StringIO()
 | |
| 
 | |
|     try:
 | |
|         save_stdout = sys.stdout
 | |
|         try:
 | |
|             if cfp:
 | |
|                 sys.stdout = cfp
 | |
|                 print test              # Output file starts with test name
 | |
|             if test.startswith('test.'):
 | |
|                 abstest = test
 | |
|             else:
 | |
|                 # Always import it from the test package
 | |
|                 abstest = 'test.' + test
 | |
|             the_package = __import__(abstest, globals(), locals(), [])
 | |
|             the_module = getattr(the_package, test)
 | |
|             # Most tests run to completion simply as a side-effect of
 | |
|             # being imported.  For the benefit of tests that can't run
 | |
|             # that way (like test_threaded_import), explicitly invoke
 | |
|             # their test_main() function (if it exists).
 | |
|             indirect_test = getattr(the_module, "test_main", None)
 | |
|             if indirect_test is not None:
 | |
|                 indirect_test()
 | |
|             if huntrleaks:
 | |
|                 dash_R(the_module, test, indirect_test, huntrleaks)
 | |
|         finally:
 | |
|             sys.stdout = save_stdout
 | |
|     except test_support.ResourceDenied, msg:
 | |
|         if not quiet:
 | |
|             print test, "skipped --", msg
 | |
|             sys.stdout.flush()
 | |
|         return -2
 | |
|     except (ImportError, test_support.TestSkipped), msg:
 | |
|         if not quiet:
 | |
|             print test, "skipped --", msg
 | |
|             sys.stdout.flush()
 | |
|         return -1
 | |
|     except KeyboardInterrupt:
 | |
|         raise
 | |
|     except test_support.TestFailed, msg:
 | |
|         print "test", test, "failed --", msg
 | |
|         sys.stdout.flush()
 | |
|         return 0
 | |
|     except:
 | |
|         type, value = sys.exc_info()[:2]
 | |
|         print "test", test, "crashed --", str(type) + ":", value
 | |
|         sys.stdout.flush()
 | |
|         if verbose:
 | |
|             traceback.print_exc(file=sys.stdout)
 | |
|             sys.stdout.flush()
 | |
|         return 0
 | |
|     else:
 | |
|         if not cfp:
 | |
|             return 1
 | |
|         output = cfp.getvalue()
 | |
|         if generate:
 | |
|             if output == test + "\n":
 | |
|                 if os.path.exists(outputfile):
 | |
|                     # Write it since it already exists (and the contents
 | |
|                     # may have changed), but let the user know it isn't
 | |
|                     # needed:
 | |
|                     print "output file", outputfile, \
 | |
|                           "is no longer needed; consider removing it"
 | |
|                 else:
 | |
|                     # We don't need it, so don't create it.
 | |
|                     return 1
 | |
|             fp = open(outputfile, "w")
 | |
|             fp.write(output)
 | |
|             fp.close()
 | |
|             return 1
 | |
|         if os.path.exists(outputfile):
 | |
|             fp = open(outputfile, "r")
 | |
|             expected = fp.read()
 | |
|             fp.close()
 | |
|         else:
 | |
|             expected = test + "\n"
 | |
|         if output == expected or huntrleaks:
 | |
|             return 1
 | |
|         print "test", test, "produced unexpected output:"
 | |
|         sys.stdout.flush()
 | |
|         reportdiff(expected, output)
 | |
|         sys.stdout.flush()
 | |
|         return 0
 | |
| 
 | |
| def dash_R(the_module, test, indirect_test, huntrleaks):
 | |
|     # This code is hackish and inelegant, but it seems to do the job.
 | |
|     import copy_reg
 | |
| 
 | |
|     if not hasattr(sys, 'gettotalrefcount'):
 | |
|         raise Exception("Tracking reference leaks requires a debug build "
 | |
|                         "of Python")
 | |
| 
 | |
|     # Save current values for dash_R_cleanup() to restore.
 | |
|     fs = warnings.filters[:]
 | |
|     ps = copy_reg.dispatch_table.copy()
 | |
|     pic = sys.path_importer_cache.copy()
 | |
| 
 | |
|     if indirect_test:
 | |
|         def run_the_test():
 | |
|             indirect_test()
 | |
|     else:
 | |
|         def run_the_test():
 | |
|             reload(the_module)
 | |
| 
 | |
|     deltas = []
 | |
|     nwarmup, ntracked, fname = huntrleaks
 | |
|     repcount = nwarmup + ntracked
 | |
|     print >> sys.stderr, "beginning", repcount, "repetitions"
 | |
|     print >> sys.stderr, ("1234567890"*(repcount//10 + 1))[:repcount]
 | |
|     dash_R_cleanup(fs, ps, pic)
 | |
|     for i in range(repcount):
 | |
|         rc = sys.gettotalrefcount()
 | |
|         run_the_test()
 | |
|         sys.stderr.write('.')
 | |
|         dash_R_cleanup(fs, ps, pic)
 | |
|         if i >= nwarmup:
 | |
|             deltas.append(sys.gettotalrefcount() - rc - 2)
 | |
|     print >> sys.stderr
 | |
|     if any(deltas):
 | |
|         print >> sys.stderr, test, 'leaked', deltas, 'references'
 | |
|         refrep = open(fname, "a")
 | |
|         print >> refrep, test, 'leaked', deltas, 'references'
 | |
|         refrep.close()
 | |
| 
 | |
| def dash_R_cleanup(fs, ps, pic):
 | |
|     import gc, copy_reg
 | |
|     import _strptime, linecache, warnings, dircache
 | |
|     import urlparse, urllib, urllib2, mimetypes, doctest
 | |
|     import struct, filecmp
 | |
|     from distutils.dir_util import _path_created
 | |
| 
 | |
|     # Restore some original values.
 | |
|     warnings.filters[:] = fs
 | |
|     copy_reg.dispatch_table.clear()
 | |
|     copy_reg.dispatch_table.update(ps)
 | |
|     sys.path_importer_cache.clear()
 | |
|     sys.path_importer_cache.update(pic)
 | |
| 
 | |
|     # Clear assorted module caches.
 | |
|     _path_created.clear()
 | |
|     re.purge()
 | |
|     _strptime._regex_cache.clear()
 | |
|     urlparse.clear_cache()
 | |
|     urllib.urlcleanup()
 | |
|     urllib2.install_opener(None)
 | |
|     dircache.reset()
 | |
|     linecache.clearcache()
 | |
|     mimetypes._default_mime_types()
 | |
|     struct._cache.clear()
 | |
|     filecmp._cache.clear()
 | |
|     doctest.master = None
 | |
| 
 | |
|     # Collect cyclic trash.
 | |
|     gc.collect()
 | |
| 
 | |
| def reportdiff(expected, output):
 | |
|     import difflib
 | |
|     print "*" * 70
 | |
|     a = expected.splitlines(1)
 | |
|     b = output.splitlines(1)
 | |
|     sm = difflib.SequenceMatcher(a=a, b=b)
 | |
|     tuples = sm.get_opcodes()
 | |
| 
 | |
|     def pair(x0, x1):
 | |
|         # x0:x1 are 0-based slice indices; convert to 1-based line indices.
 | |
|         x0 += 1
 | |
|         if x0 >= x1:
 | |
|             return "line " + str(x0)
 | |
|         else:
 | |
|             return "lines %d-%d" % (x0, x1)
 | |
| 
 | |
|     for op, a0, a1, b0, b1 in tuples:
 | |
|         if op == 'equal':
 | |
|             pass
 | |
| 
 | |
|         elif op == 'delete':
 | |
|             print "***", pair(a0, a1), "of expected output missing:"
 | |
|             for line in a[a0:a1]:
 | |
|                 print "-", line,
 | |
| 
 | |
|         elif op == 'replace':
 | |
|             print "*** mismatch between", pair(a0, a1), "of expected", \
 | |
|                   "output and", pair(b0, b1), "of actual output:"
 | |
|             for line in difflib.ndiff(a[a0:a1], b[b0:b1]):
 | |
|                 print line,
 | |
| 
 | |
|         elif op == 'insert':
 | |
|             print "***", pair(b0, b1), "of actual output doesn't appear", \
 | |
|                   "in expected output after line", str(a1)+":"
 | |
|             for line in b[b0:b1]:
 | |
|                 print "+", line,
 | |
| 
 | |
|         else:
 | |
|             print "get_opcodes() returned bad tuple?!?!", (op, a0, a1, b0, b1)
 | |
| 
 | |
|     print "*" * 70
 | |
| 
 | |
| def findtestdir():
 | |
|     if __name__ == '__main__':
 | |
|         file = sys.argv[0]
 | |
|     else:
 | |
|         file = __file__
 | |
|     testdir = os.path.dirname(file) or os.curdir
 | |
|     return testdir
 | |
| 
 | |
| def removepy(name):
 | |
|     if name.endswith(os.extsep + "py"):
 | |
|         name = name[:-3]
 | |
|     return name
 | |
| 
 | |
| def count(n, word):
 | |
|     if n == 1:
 | |
|         return "%d %s" % (n, word)
 | |
|     else:
 | |
|         return "%d %ss" % (n, word)
 | |
| 
 | |
| def printlist(x, width=70, indent=4):
 | |
|     """Print the elements of iterable x to stdout.
 | |
| 
 | |
|     Optional arg width (default 70) is the maximum line length.
 | |
|     Optional arg indent (default 4) is the number of blanks with which to
 | |
|     begin each line.
 | |
|     """
 | |
| 
 | |
|     from textwrap import fill
 | |
|     blanks = ' ' * indent
 | |
|     print fill(' '.join(map(str, x)), width,
 | |
|                initial_indent=blanks, subsequent_indent=blanks)
 | |
| 
 | |
| # Map sys.platform to a string containing the basenames of tests
 | |
| # expected to be skipped on that platform.
 | |
| #
 | |
| # Special cases:
 | |
| #     test_pep277
 | |
| #         The _ExpectedSkips constructor adds this to the set of expected
 | |
| #         skips if not os.path.supports_unicode_filenames.
 | |
| #     test_socket_ssl
 | |
| #         Controlled by test_socket_ssl.skip_expected.  Requires the network
 | |
| #         resource, and a socket module with ssl support.
 | |
| #     test_timeout
 | |
| #         Controlled by test_timeout.skip_expected.  Requires the network
 | |
| #         resource and a socket module.
 | |
| 
 | |
| _expectations = {
 | |
|     'win32':
 | |
|         """
 | |
|         test__locale
 | |
|         test_applesingle
 | |
|         test_al
 | |
|         test_bsddb185
 | |
|         test_bsddb3
 | |
|         test_cd
 | |
|         test_cl
 | |
|         test_commands
 | |
|         test_crypt
 | |
|         test_curses
 | |
|         test_dbm
 | |
|         test_dl
 | |
|         test_fcntl
 | |
|         test_fork1
 | |
|         test_gdbm
 | |
|         test_gl
 | |
|         test_grp
 | |
|         test_imgfile
 | |
|         test_ioctl
 | |
|         test_largefile
 | |
|         test_linuxaudiodev
 | |
|         test_mhlib
 | |
|         test_nis
 | |
|         test_openpty
 | |
|         test_ossaudiodev
 | |
|         test_poll
 | |
|         test_posix
 | |
|         test_pty
 | |
|         test_pwd
 | |
|         test_resource
 | |
|         test_signal
 | |
|         test_sunaudiodev
 | |
|         test_threadsignals
 | |
|         test_timing
 | |
|         test_wait3
 | |
|         test_wait4
 | |
|         """,
 | |
|     'linux2':
 | |
|         """
 | |
|         test_al
 | |
|         test_applesingle
 | |
|         test_bsddb185
 | |
|         test_cd
 | |
|         test_cl
 | |
|         test_curses
 | |
|         test_dl
 | |
|         test_gl
 | |
|         test_imgfile
 | |
|         test_largefile
 | |
|         test_linuxaudiodev
 | |
|         test_nis
 | |
|         test_ntpath
 | |
|         test_ossaudiodev
 | |
|         test_sqlite
 | |
|         test_startfile
 | |
|         test_sunaudiodev
 | |
|         """,
 | |
|    'mac':
 | |
|         """
 | |
|         test_al
 | |
|         test_atexit
 | |
|         test_bsddb
 | |
|         test_bsddb185
 | |
|         test_bsddb3
 | |
|         test_bz2
 | |
|         test_cd
 | |
|         test_cl
 | |
|         test_commands
 | |
|         test_crypt
 | |
|         test_curses
 | |
|         test_dbm
 | |
|         test_dl
 | |
|         test_fcntl
 | |
|         test_fork1
 | |
|         test_gl
 | |
|         test_grp
 | |
|         test_ioctl
 | |
|         test_imgfile
 | |
|         test_largefile
 | |
|         test_linuxaudiodev
 | |
|         test_locale
 | |
|         test_mmap
 | |
|         test_nis
 | |
|         test_ntpath
 | |
|         test_openpty
 | |
|         test_ossaudiodev
 | |
|         test_poll
 | |
|         test_popen
 | |
|         test_popen2
 | |
|         test_posix
 | |
|         test_pty
 | |
|         test_pwd
 | |
|         test_resource
 | |
|         test_signal
 | |
|         test_sqlite
 | |
|         test_startfile
 | |
|         test_sunaudiodev
 | |
|         test_sundry
 | |
|         test_tarfile
 | |
|         test_timing
 | |
|         """,
 | |
|     'unixware7':
 | |
|         """
 | |
|         test_al
 | |
|         test_applesingle
 | |
|         test_bsddb
 | |
|         test_bsddb185
 | |
|         test_cd
 | |
|         test_cl
 | |
|         test_dl
 | |
|         test_gl
 | |
|         test_imgfile
 | |
|         test_largefile
 | |
|         test_linuxaudiodev
 | |
|         test_minidom
 | |
|         test_nis
 | |
|         test_ntpath
 | |
|         test_openpty
 | |
|         test_pyexpat
 | |
|         test_sax
 | |
|         test_startfile
 | |
|         test_sqlite
 | |
|         test_sunaudiodev
 | |
|         test_sundry
 | |
|         """,
 | |
|     'openunix8':
 | |
|         """
 | |
|         test_al
 | |
|         test_applesingle
 | |
|         test_bsddb
 | |
|         test_bsddb185
 | |
|         test_cd
 | |
|         test_cl
 | |
|         test_dl
 | |
|         test_gl
 | |
|         test_imgfile
 | |
|         test_largefile
 | |
|         test_linuxaudiodev
 | |
|         test_minidom
 | |
|         test_nis
 | |
|         test_ntpath
 | |
|         test_openpty
 | |
|         test_pyexpat
 | |
|         test_sax
 | |
|         test_sqlite
 | |
|         test_startfile
 | |
|         test_sunaudiodev
 | |
|         test_sundry
 | |
|         """,
 | |
|     'sco_sv3':
 | |
|         """
 | |
|         test_al
 | |
|         test_applesingle
 | |
|         test_asynchat
 | |
|         test_bsddb
 | |
|         test_bsddb185
 | |
|         test_cd
 | |
|         test_cl
 | |
|         test_dl
 | |
|         test_fork1
 | |
|         test_gettext
 | |
|         test_gl
 | |
|         test_imgfile
 | |
|         test_largefile
 | |
|         test_linuxaudiodev
 | |
|         test_locale
 | |
|         test_minidom
 | |
|         test_nis
 | |
|         test_ntpath
 | |
|         test_openpty
 | |
|         test_pyexpat
 | |
|         test_queue
 | |
|         test_sax
 | |
|         test_sqlite
 | |
|         test_startfile
 | |
|         test_sunaudiodev
 | |
|         test_sundry
 | |
|         test_thread
 | |
|         test_threaded_import
 | |
|         test_threadedtempfile
 | |
|         test_threading
 | |
|         """,
 | |
|     'riscos':
 | |
|         """
 | |
|         test_al
 | |
|         test_applesingle
 | |
|         test_asynchat
 | |
|         test_atexit
 | |
|         test_bsddb
 | |
|         test_bsddb185
 | |
|         test_bsddb3
 | |
|         test_cd
 | |
|         test_cl
 | |
|         test_commands
 | |
|         test_crypt
 | |
|         test_dbm
 | |
|         test_dl
 | |
|         test_fcntl
 | |
|         test_fork1
 | |
|         test_gdbm
 | |
|         test_gl
 | |
|         test_grp
 | |
|         test_imgfile
 | |
|         test_largefile
 | |
|         test_linuxaudiodev
 | |
|         test_locale
 | |
|         test_mmap
 | |
|         test_nis
 | |
|         test_ntpath
 | |
|         test_openpty
 | |
|         test_poll
 | |
|         test_popen2
 | |
|         test_pty
 | |
|         test_pwd
 | |
|         test_strop
 | |
|         test_sqlite
 | |
|         test_startfile
 | |
|         test_sunaudiodev
 | |
|         test_sundry
 | |
|         test_thread
 | |
|         test_threaded_import
 | |
|         test_threadedtempfile
 | |
|         test_threading
 | |
|         test_timing
 | |
|         """,
 | |
|     'darwin':
 | |
|         """
 | |
|         test__locale
 | |
|         test_al
 | |
|         test_bsddb
 | |
|         test_bsddb3
 | |
|         test_cd
 | |
|         test_cl
 | |
|         test_curses
 | |
|         test_gdbm
 | |
|         test_gl
 | |
|         test_imgfile
 | |
|         test_largefile
 | |
|         test_linuxaudiodev
 | |
|         test_locale
 | |
|         test_minidom
 | |
|         test_nis
 | |
|         test_ntpath
 | |
|         test_ossaudiodev
 | |
|         test_poll
 | |
|         test_sqlite
 | |
|         test_startfile
 | |
|         test_sunaudiodev
 | |
|         """,
 | |
|     'sunos5':
 | |
|         """
 | |
|         test_al
 | |
|         test_applesingle
 | |
|         test_bsddb
 | |
|         test_bsddb185
 | |
|         test_cd
 | |
|         test_cl
 | |
|         test_curses
 | |
|         test_dbm
 | |
|         test_gdbm
 | |
|         test_gl
 | |
|         test_gzip
 | |
|         test_imgfile
 | |
|         test_linuxaudiodev
 | |
|         test_openpty
 | |
|         test_sqlite
 | |
|         test_startfile
 | |
|         test_zipfile
 | |
|         test_zlib
 | |
|         """,
 | |
|     'hp-ux11':
 | |
|         """
 | |
|         test_al
 | |
|         test_applesingle
 | |
|         test_bsddb
 | |
|         test_bsddb185
 | |
|         test_cd
 | |
|         test_cl
 | |
|         test_curses
 | |
|         test_dl
 | |
|         test_gdbm
 | |
|         test_gl
 | |
|         test_gzip
 | |
|         test_imgfile
 | |
|         test_largefile
 | |
|         test_linuxaudiodev
 | |
|         test_locale
 | |
|         test_minidom
 | |
|         test_nis
 | |
|         test_ntpath
 | |
|         test_openpty
 | |
|         test_pyexpat
 | |
|         test_sax
 | |
|         test_sqlite
 | |
|         test_startfile
 | |
|         test_sunaudiodev
 | |
|         test_zipfile
 | |
|         test_zlib
 | |
|         """,
 | |
|     'atheos':
 | |
|         """
 | |
|         test_al
 | |
|         test_applesingle
 | |
|         test_bsddb185
 | |
|         test_cd
 | |
|         test_cl
 | |
|         test_curses
 | |
|         test_dl
 | |
|         test_gdbm
 | |
|         test_gl
 | |
|         test_imgfile
 | |
|         test_largefile
 | |
|         test_linuxaudiodev
 | |
|         test_locale
 | |
|         test_mhlib
 | |
|         test_mmap
 | |
|         test_nis
 | |
|         test_poll
 | |
|         test_popen2
 | |
|         test_resource
 | |
|         test_sqlite
 | |
|         test_startfile
 | |
|         test_sunaudiodev
 | |
|         """,
 | |
|     'cygwin':
 | |
|         """
 | |
|         test_al
 | |
|         test_applesingle
 | |
|         test_bsddb185
 | |
|         test_bsddb3
 | |
|         test_cd
 | |
|         test_cl
 | |
|         test_curses
 | |
|         test_dbm
 | |
|         test_gl
 | |
|         test_imgfile
 | |
|         test_ioctl
 | |
|         test_largefile
 | |
|         test_linuxaudiodev
 | |
|         test_locale
 | |
|         test_nis
 | |
|         test_ossaudiodev
 | |
|         test_socketserver
 | |
|         test_sqlite
 | |
|         test_sunaudiodev
 | |
|         """,
 | |
|     'os2emx':
 | |
|         """
 | |
|         test_al
 | |
|         test_applesingle
 | |
|         test_audioop
 | |
|         test_bsddb185
 | |
|         test_bsddb3
 | |
|         test_cd
 | |
|         test_cl
 | |
|         test_commands
 | |
|         test_curses
 | |
|         test_dl
 | |
|         test_gl
 | |
|         test_imgfile
 | |
|         test_largefile
 | |
|         test_linuxaudiodev
 | |
|         test_mhlib
 | |
|         test_mmap
 | |
|         test_nis
 | |
|         test_openpty
 | |
|         test_ossaudiodev
 | |
|         test_pty
 | |
|         test_resource
 | |
|         test_signal
 | |
|         test_sqlite
 | |
|         test_startfile
 | |
|         test_sunaudiodev
 | |
|         """,
 | |
|     'freebsd4':
 | |
|         """
 | |
|         test_aepack
 | |
|         test_al
 | |
|         test_applesingle
 | |
|         test_bsddb
 | |
|         test_bsddb3
 | |
|         test_cd
 | |
|         test_cl
 | |
|         test_gdbm
 | |
|         test_gl
 | |
|         test_imgfile
 | |
|         test_linuxaudiodev
 | |
|         test_locale
 | |
|         test_macfs
 | |
|         test_macostools
 | |
|         test_nis
 | |
|         test_ossaudiodev
 | |
|         test_pep277
 | |
|         test_plistlib
 | |
|         test_pty
 | |
|         test_scriptpackages
 | |
|         test_socket_ssl
 | |
|         test_socketserver
 | |
|         test_sqlite
 | |
|         test_startfile
 | |
|         test_sunaudiodev
 | |
|         test_tcl
 | |
|         test_timeout
 | |
|         test_unicode_file
 | |
|         test_urllibnet
 | |
|         test_winreg
 | |
|         test_winsound
 | |
|         """,
 | |
|     'aix5':
 | |
|         """
 | |
|         test_aepack
 | |
|         test_al
 | |
|         test_applesingle
 | |
|         test_bsddb
 | |
|         test_bsddb185
 | |
|         test_bsddb3
 | |
|         test_bz2
 | |
|         test_cd
 | |
|         test_cl
 | |
|         test_dl
 | |
|         test_gdbm
 | |
|         test_gl
 | |
|         test_gzip
 | |
|         test_imgfile
 | |
|         test_linuxaudiodev
 | |
|         test_macfs
 | |
|         test_macostools
 | |
|         test_nis
 | |
|         test_ossaudiodev
 | |
|         test_sqlite
 | |
|         test_startfile
 | |
|         test_sunaudiodev
 | |
|         test_tcl
 | |
|         test_winreg
 | |
|         test_winsound
 | |
|         test_zipimport
 | |
|         test_zlib
 | |
|         """,
 | |
|     'openbsd3':
 | |
|         """
 | |
|         test_aepack
 | |
|         test_al
 | |
|         test_applesingle
 | |
|         test_bsddb
 | |
|         test_bsddb3
 | |
|         test_cd
 | |
|         test_cl
 | |
|         test_ctypes
 | |
|         test_dl
 | |
|         test_gdbm
 | |
|         test_gl
 | |
|         test_imgfile
 | |
|         test_linuxaudiodev
 | |
|         test_locale
 | |
|         test_macfs
 | |
|         test_macostools
 | |
|         test_nis
 | |
|         test_normalization
 | |
|         test_ossaudiodev
 | |
|         test_pep277
 | |
|         test_plistlib
 | |
|         test_scriptpackages
 | |
|         test_tcl
 | |
|         test_sqlite
 | |
|         test_startfile
 | |
|         test_sunaudiodev
 | |
|         test_unicode_file
 | |
|         test_winreg
 | |
|         test_winsound
 | |
|         """,
 | |
| }
 | |
| _expectations['freebsd5'] = _expectations['freebsd4']
 | |
| _expectations['freebsd6'] = _expectations['freebsd4']
 | |
| _expectations['freebsd7'] = _expectations['freebsd4']
 | |
| 
 | |
| class _ExpectedSkips:
 | |
|     def __init__(self):
 | |
|         import os.path
 | |
|         from test import test_socket_ssl
 | |
|         from test import test_timeout
 | |
| 
 | |
|         self.valid = False
 | |
|         if sys.platform in _expectations:
 | |
|             s = _expectations[sys.platform]
 | |
|             self.expected = set(s.split())
 | |
| 
 | |
|             if not os.path.supports_unicode_filenames:
 | |
|                 self.expected.add('test_pep277')
 | |
| 
 | |
|             if test_socket_ssl.skip_expected:
 | |
|                 self.expected.add('test_socket_ssl')
 | |
| 
 | |
|             if test_timeout.skip_expected:
 | |
|                 self.expected.add('test_timeout')
 | |
| 
 | |
|             if sys.maxint == 9223372036854775807L:
 | |
|                 self.expected.add('test_rgbimg')
 | |
|                 self.expected.add('test_imageop')
 | |
| 
 | |
|             if not sys.platform in ("mac", "darwin"):
 | |
|                 MAC_ONLY = ["test_macostools", "test_macfs", "test_aepack",
 | |
|                             "test_plistlib", "test_scriptpackages"]
 | |
|                 for skip in MAC_ONLY:
 | |
|                     self.expected.add(skip)
 | |
| 
 | |
|             if sys.platform != "win32":
 | |
|                 WIN_ONLY = ["test_unicode_file", "test_winreg",
 | |
|                             "test_winsound"]
 | |
|                 for skip in WIN_ONLY:
 | |
|                     self.expected.add(skip)
 | |
| 
 | |
|             self.valid = True
 | |
| 
 | |
|     def isvalid(self):
 | |
|         "Return true iff _ExpectedSkips knows about the current platform."
 | |
|         return self.valid
 | |
| 
 | |
|     def getexpected(self):
 | |
|         """Return set of test names we expect to skip on current platform.
 | |
| 
 | |
|         self.isvalid() must be true.
 | |
|         """
 | |
| 
 | |
|         assert self.isvalid()
 | |
|         return self.expected
 | |
| 
 | |
| if __name__ == '__main__':
 | |
|     # Remove regrtest.py's own directory from the module search path.  This
 | |
|     # prevents relative imports from working, and relative imports will screw
 | |
|     # up the testing framework.  E.g. if both test.test_support and
 | |
|     # test_support are imported, they will not contain the same globals, and
 | |
|     # much of the testing framework relies on the globals in the
 | |
|     # test.test_support module.
 | |
|     mydir = os.path.abspath(os.path.normpath(os.path.dirname(sys.argv[0])))
 | |
|     i = pathlen = len(sys.path)
 | |
|     while i >= 0:
 | |
|         i -= 1
 | |
|         if os.path.abspath(os.path.normpath(sys.path[i])) == mydir:
 | |
|             del sys.path[i]
 | |
|     if len(sys.path) == pathlen:
 | |
|         print 'Could not find %r in sys.path to remove it' % mydir
 | |
|     main()
 |