mirror of
https://github.com/python/cpython.git
synced 2025-07-08 03:45:36 +00:00

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. ........
1216 lines
41 KiB
Python
1216 lines
41 KiB
Python
# subprocess - Subprocesses with accessible I/O streams
|
|
#
|
|
# For more information about this module, see PEP 324.
|
|
#
|
|
# This module should remain compatible with Python 2.2, see PEP 291.
|
|
#
|
|
# Copyright (c) 2003-2005 by Peter Astrand <astrand@lysator.liu.se>
|
|
#
|
|
# Licensed to PSF under a Contributor Agreement.
|
|
# See http://www.python.org/2.4/license for licensing details.
|
|
|
|
r"""subprocess - Subprocesses with accessible I/O streams
|
|
|
|
This module allows you to spawn processes, connect to their
|
|
input/output/error pipes, and obtain their return codes. This module
|
|
intends to replace several other, older modules and functions, like:
|
|
|
|
os.system
|
|
os.spawn*
|
|
os.popen*
|
|
popen2.*
|
|
commands.*
|
|
|
|
Information about how the subprocess module can be used to replace these
|
|
modules and functions can be found below.
|
|
|
|
|
|
|
|
Using the subprocess module
|
|
===========================
|
|
This module defines one class called Popen:
|
|
|
|
class Popen(args, bufsize=0, executable=None,
|
|
stdin=None, stdout=None, stderr=None,
|
|
preexec_fn=None, close_fds=False, shell=False,
|
|
cwd=None, env=None, universal_newlines=False,
|
|
startupinfo=None, creationflags=0):
|
|
|
|
|
|
Arguments are:
|
|
|
|
args should be a string, or a sequence of program arguments. The
|
|
program to execute is normally the first item in the args sequence or
|
|
string, but can be explicitly set by using the executable argument.
|
|
|
|
On UNIX, with shell=False (default): In this case, the Popen class
|
|
uses os.execvp() to execute the child program. args should normally
|
|
be a sequence. A string will be treated as a sequence with the string
|
|
as the only item (the program to execute).
|
|
|
|
On UNIX, with shell=True: If args is a string, it specifies the
|
|
command string to execute through the shell. If args is a sequence,
|
|
the first item specifies the command string, and any additional items
|
|
will be treated as additional shell arguments.
|
|
|
|
On Windows: the Popen class uses CreateProcess() to execute the child
|
|
program, which operates on strings. If args is a sequence, it will be
|
|
converted to a string using the list2cmdline method. Please note that
|
|
not all MS Windows applications interpret the command line the same
|
|
way: The list2cmdline is designed for applications using the same
|
|
rules as the MS C runtime.
|
|
|
|
bufsize, if given, has the same meaning as the corresponding argument
|
|
to the built-in open() function: 0 means unbuffered, 1 means line
|
|
buffered, any other positive value means use a buffer of
|
|
(approximately) that size. A negative bufsize means to use the system
|
|
default, which usually means fully buffered. The default value for
|
|
bufsize is 0 (unbuffered).
|
|
|
|
stdin, stdout and stderr specify the executed programs' standard
|
|
input, standard output and standard error file handles, respectively.
|
|
Valid values are PIPE, an existing file descriptor (a positive
|
|
integer), an existing file object, and None. PIPE indicates that a
|
|
new pipe to the child should be created. With None, no redirection
|
|
will occur; the child's file handles will be inherited from the
|
|
parent. Additionally, stderr can be STDOUT, which indicates that the
|
|
stderr data from the applications should be captured into the same
|
|
file handle as for stdout.
|
|
|
|
If preexec_fn is set to a callable object, this object will be called
|
|
in the child process just before the child is executed.
|
|
|
|
If close_fds is true, all file descriptors except 0, 1 and 2 will be
|
|
closed before the child process is executed.
|
|
|
|
if shell is true, the specified command will be executed through the
|
|
shell.
|
|
|
|
If cwd is not None, the current directory will be changed to cwd
|
|
before the child is executed.
|
|
|
|
If env is not None, it defines the environment variables for the new
|
|
process.
|
|
|
|
If universal_newlines is true, the file objects stdout and stderr are
|
|
opened as a text files, but lines may be terminated by any of '\n',
|
|
the Unix end-of-line convention, '\r', the Macintosh convention or
|
|
'\r\n', the Windows convention. All of these external representations
|
|
are seen as '\n' by the Python program. Note: This feature is only
|
|
available if Python is built with universal newline support (the
|
|
default). Also, the newlines attribute of the file objects stdout,
|
|
stdin and stderr are not updated by the communicate() method.
|
|
|
|
The startupinfo and creationflags, if given, will be passed to the
|
|
underlying CreateProcess() function. They can specify things such as
|
|
appearance of the main window and priority for the new process.
|
|
(Windows only)
|
|
|
|
|
|
This module also defines two shortcut functions:
|
|
|
|
call(*popenargs, **kwargs):
|
|
Run command with arguments. Wait for command to complete, then
|
|
return the returncode attribute.
|
|
|
|
The arguments are the same as for the Popen constructor. Example:
|
|
|
|
retcode = call(["ls", "-l"])
|
|
|
|
check_call(*popenargs, **kwargs):
|
|
Run command with arguments. Wait for command to complete. If the
|
|
exit code was zero then return, otherwise raise
|
|
CalledProcessError. The CalledProcessError object will have the
|
|
return code in the errno attribute.
|
|
|
|
The arguments are the same as for the Popen constructor. Example:
|
|
|
|
check_call(["ls", "-l"])
|
|
|
|
Exceptions
|
|
----------
|
|
Exceptions raised in the child process, before the new program has
|
|
started to execute, will be re-raised in the parent. Additionally,
|
|
the exception object will have one extra attribute called
|
|
'child_traceback', which is a string containing traceback information
|
|
from the childs point of view.
|
|
|
|
The most common exception raised is OSError. This occurs, for
|
|
example, when trying to execute a non-existent file. Applications
|
|
should prepare for OSErrors.
|
|
|
|
A ValueError will be raised if Popen is called with invalid arguments.
|
|
|
|
check_call() will raise CalledProcessError, which is a subclass of
|
|
OSError, if the called process returns a non-zero return code.
|
|
|
|
|
|
Security
|
|
--------
|
|
Unlike some other popen functions, this implementation will never call
|
|
/bin/sh implicitly. This means that all characters, including shell
|
|
metacharacters, can safely be passed to child processes.
|
|
|
|
|
|
Popen objects
|
|
=============
|
|
Instances of the Popen class have the following methods:
|
|
|
|
poll()
|
|
Check if child process has terminated. Returns returncode
|
|
attribute.
|
|
|
|
wait()
|
|
Wait for child process to terminate. Returns returncode attribute.
|
|
|
|
communicate(input=None)
|
|
Interact with process: Send data to stdin. Read data from stdout
|
|
and stderr, until end-of-file is reached. Wait for process to
|
|
terminate. The optional stdin argument should be a string to be
|
|
sent to the child process, or None, if no data should be sent to
|
|
the child.
|
|
|
|
communicate() returns a tuple (stdout, stderr).
|
|
|
|
Note: The data read is buffered in memory, so do not use this
|
|
method if the data size is large or unlimited.
|
|
|
|
The following attributes are also available:
|
|
|
|
stdin
|
|
If the stdin argument is PIPE, this attribute is a file object
|
|
that provides input to the child process. Otherwise, it is None.
|
|
|
|
stdout
|
|
If the stdout argument is PIPE, this attribute is a file object
|
|
that provides output from the child process. Otherwise, it is
|
|
None.
|
|
|
|
stderr
|
|
If the stderr argument is PIPE, this attribute is file object that
|
|
provides error output from the child process. Otherwise, it is
|
|
None.
|
|
|
|
pid
|
|
The process ID of the child process.
|
|
|
|
returncode
|
|
The child return code. A None value indicates that the process
|
|
hasn't terminated yet. A negative value -N indicates that the
|
|
child was terminated by signal N (UNIX only).
|
|
|
|
|
|
Replacing older functions with the subprocess module
|
|
====================================================
|
|
In this section, "a ==> b" means that b can be used as a replacement
|
|
for a.
|
|
|
|
Note: All functions in this section fail (more or less) silently if
|
|
the executed program cannot be found; this module raises an OSError
|
|
exception.
|
|
|
|
In the following examples, we assume that the subprocess module is
|
|
imported with "from subprocess import *".
|
|
|
|
|
|
Replacing /bin/sh shell backquote
|
|
---------------------------------
|
|
output=`mycmd myarg`
|
|
==>
|
|
output = Popen(["mycmd", "myarg"], stdout=PIPE).communicate()[0]
|
|
|
|
|
|
Replacing shell pipe line
|
|
-------------------------
|
|
output=`dmesg | grep hda`
|
|
==>
|
|
p1 = Popen(["dmesg"], stdout=PIPE)
|
|
p2 = Popen(["grep", "hda"], stdin=p1.stdout, stdout=PIPE)
|
|
output = p2.communicate()[0]
|
|
|
|
|
|
Replacing os.system()
|
|
---------------------
|
|
sts = os.system("mycmd" + " myarg")
|
|
==>
|
|
p = Popen("mycmd" + " myarg", shell=True)
|
|
sts = os.waitpid(p.pid, 0)
|
|
|
|
Note:
|
|
|
|
* Calling the program through the shell is usually not required.
|
|
|
|
* It's easier to look at the returncode attribute than the
|
|
exitstatus.
|
|
|
|
A more real-world example would look like this:
|
|
|
|
try:
|
|
retcode = call("mycmd" + " myarg", shell=True)
|
|
if retcode < 0:
|
|
print >>sys.stderr, "Child was terminated by signal", -retcode
|
|
else:
|
|
print >>sys.stderr, "Child returned", retcode
|
|
except OSError, e:
|
|
print >>sys.stderr, "Execution failed:", e
|
|
|
|
|
|
Replacing os.spawn*
|
|
-------------------
|
|
P_NOWAIT example:
|
|
|
|
pid = os.spawnlp(os.P_NOWAIT, "/bin/mycmd", "mycmd", "myarg")
|
|
==>
|
|
pid = Popen(["/bin/mycmd", "myarg"]).pid
|
|
|
|
|
|
P_WAIT example:
|
|
|
|
retcode = os.spawnlp(os.P_WAIT, "/bin/mycmd", "mycmd", "myarg")
|
|
==>
|
|
retcode = call(["/bin/mycmd", "myarg"])
|
|
|
|
|
|
Vector example:
|
|
|
|
os.spawnvp(os.P_NOWAIT, path, args)
|
|
==>
|
|
Popen([path] + args[1:])
|
|
|
|
|
|
Environment example:
|
|
|
|
os.spawnlpe(os.P_NOWAIT, "/bin/mycmd", "mycmd", "myarg", env)
|
|
==>
|
|
Popen(["/bin/mycmd", "myarg"], env={"PATH": "/usr/bin"})
|
|
|
|
|
|
Replacing os.popen*
|
|
-------------------
|
|
pipe = os.popen(cmd, mode='r', bufsize)
|
|
==>
|
|
pipe = Popen(cmd, shell=True, bufsize=bufsize, stdout=PIPE).stdout
|
|
|
|
pipe = os.popen(cmd, mode='w', bufsize)
|
|
==>
|
|
pipe = Popen(cmd, shell=True, bufsize=bufsize, stdin=PIPE).stdin
|
|
|
|
|
|
(child_stdin, child_stdout) = os.popen2(cmd, mode, bufsize)
|
|
==>
|
|
p = Popen(cmd, shell=True, bufsize=bufsize,
|
|
stdin=PIPE, stdout=PIPE, close_fds=True)
|
|
(child_stdin, child_stdout) = (p.stdin, p.stdout)
|
|
|
|
|
|
(child_stdin,
|
|
child_stdout,
|
|
child_stderr) = os.popen3(cmd, mode, bufsize)
|
|
==>
|
|
p = Popen(cmd, shell=True, bufsize=bufsize,
|
|
stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)
|
|
(child_stdin,
|
|
child_stdout,
|
|
child_stderr) = (p.stdin, p.stdout, p.stderr)
|
|
|
|
|
|
(child_stdin, child_stdout_and_stderr) = os.popen4(cmd, mode, bufsize)
|
|
==>
|
|
p = Popen(cmd, shell=True, bufsize=bufsize,
|
|
stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True)
|
|
(child_stdin, child_stdout_and_stderr) = (p.stdin, p.stdout)
|
|
|
|
|
|
Replacing popen2.*
|
|
------------------
|
|
Note: If the cmd argument to popen2 functions is a string, the command
|
|
is executed through /bin/sh. If it is a list, the command is directly
|
|
executed.
|
|
|
|
(child_stdout, child_stdin) = popen2.popen2("somestring", bufsize, mode)
|
|
==>
|
|
p = Popen(["somestring"], shell=True, bufsize=bufsize
|
|
stdin=PIPE, stdout=PIPE, close_fds=True)
|
|
(child_stdout, child_stdin) = (p.stdout, p.stdin)
|
|
|
|
|
|
(child_stdout, child_stdin) = popen2.popen2(["mycmd", "myarg"], bufsize, mode)
|
|
==>
|
|
p = Popen(["mycmd", "myarg"], bufsize=bufsize,
|
|
stdin=PIPE, stdout=PIPE, close_fds=True)
|
|
(child_stdout, child_stdin) = (p.stdout, p.stdin)
|
|
|
|
The popen2.Popen3 and popen3.Popen4 basically works as subprocess.Popen,
|
|
except that:
|
|
|
|
* subprocess.Popen raises an exception if the execution fails
|
|
* the capturestderr argument is replaced with the stderr argument.
|
|
* stdin=PIPE and stdout=PIPE must be specified.
|
|
* popen2 closes all filedescriptors by default, but you have to specify
|
|
close_fds=True with subprocess.Popen.
|
|
|
|
|
|
"""
|
|
|
|
import sys
|
|
mswindows = (sys.platform == "win32")
|
|
|
|
import os
|
|
import types
|
|
import traceback
|
|
|
|
# Exception classes used by this module.
|
|
class CalledProcessError(OSError):
|
|
"""This exception is raised when a process run by check_call() returns
|
|
a non-zero exit status. The exit status will be stored in the
|
|
errno attribute. This exception is a subclass of
|
|
OSError."""
|
|
|
|
if mswindows:
|
|
import threading
|
|
import msvcrt
|
|
if 0: # <-- change this to use pywin32 instead of the _subprocess driver
|
|
import pywintypes
|
|
from win32api import GetStdHandle, STD_INPUT_HANDLE, \
|
|
STD_OUTPUT_HANDLE, STD_ERROR_HANDLE
|
|
from win32api import GetCurrentProcess, DuplicateHandle, \
|
|
GetModuleFileName, GetVersion
|
|
from win32con import DUPLICATE_SAME_ACCESS, SW_HIDE
|
|
from win32pipe import CreatePipe
|
|
from win32process import CreateProcess, STARTUPINFO, \
|
|
GetExitCodeProcess, STARTF_USESTDHANDLES, \
|
|
STARTF_USESHOWWINDOW, CREATE_NEW_CONSOLE
|
|
from win32event import WaitForSingleObject, INFINITE, WAIT_OBJECT_0
|
|
else:
|
|
from _subprocess import *
|
|
class STARTUPINFO:
|
|
dwFlags = 0
|
|
hStdInput = None
|
|
hStdOutput = None
|
|
hStdError = None
|
|
wShowWindow = 0
|
|
class pywintypes:
|
|
error = IOError
|
|
else:
|
|
import select
|
|
import errno
|
|
import fcntl
|
|
import pickle
|
|
|
|
__all__ = ["Popen", "PIPE", "STDOUT", "call", "check_call", "CalledProcessError"]
|
|
|
|
try:
|
|
MAXFD = os.sysconf("SC_OPEN_MAX")
|
|
except:
|
|
MAXFD = 256
|
|
|
|
# True/False does not exist on 2.2.0
|
|
try:
|
|
False
|
|
except NameError:
|
|
False = 0
|
|
True = 1
|
|
|
|
_active = []
|
|
|
|
def _cleanup():
|
|
for inst in _active[:]:
|
|
if inst.poll(_deadstate=sys.maxint) >= 0:
|
|
try:
|
|
_active.remove(inst)
|
|
except ValueError:
|
|
# This can happen if two threads create a new Popen instance.
|
|
# It's harmless that it was already removed, so ignore.
|
|
pass
|
|
|
|
PIPE = -1
|
|
STDOUT = -2
|
|
|
|
|
|
def call(*popenargs, **kwargs):
|
|
"""Run command with arguments. Wait for command to complete, then
|
|
return the returncode attribute.
|
|
|
|
The arguments are the same as for the Popen constructor. Example:
|
|
|
|
retcode = call(["ls", "-l"])
|
|
"""
|
|
return Popen(*popenargs, **kwargs).wait()
|
|
|
|
|
|
def check_call(*popenargs, **kwargs):
|
|
"""Run command with arguments. Wait for command to complete. If
|
|
the exit code was zero then return, otherwise raise
|
|
CalledProcessError. The CalledProcessError object will have the
|
|
return code in the errno attribute.
|
|
|
|
The arguments are the same as for the Popen constructor. Example:
|
|
|
|
check_call(["ls", "-l"])
|
|
"""
|
|
retcode = call(*popenargs, **kwargs)
|
|
cmd = kwargs.get("args")
|
|
if cmd is None:
|
|
cmd = popenargs[0]
|
|
if retcode:
|
|
raise CalledProcessError(retcode, "Command %s returned non-zero exit status" % cmd)
|
|
return retcode
|
|
|
|
|
|
def list2cmdline(seq):
|
|
"""
|
|
Translate a sequence of arguments into a command line
|
|
string, using the same rules as the MS C runtime:
|
|
|
|
1) Arguments are delimited by white space, which is either a
|
|
space or a tab.
|
|
|
|
2) A string surrounded by double quotation marks is
|
|
interpreted as a single argument, regardless of white space
|
|
contained within. A quoted string can be embedded in an
|
|
argument.
|
|
|
|
3) A double quotation mark preceded by a backslash is
|
|
interpreted as a literal double quotation mark.
|
|
|
|
4) Backslashes are interpreted literally, unless they
|
|
immediately precede a double quotation mark.
|
|
|
|
5) If backslashes immediately precede a double quotation mark,
|
|
every pair of backslashes is interpreted as a literal
|
|
backslash. If the number of backslashes is odd, the last
|
|
backslash escapes the next double quotation mark as
|
|
described in rule 3.
|
|
"""
|
|
|
|
# See
|
|
# http://msdn.microsoft.com/library/en-us/vccelng/htm/progs_12.asp
|
|
result = []
|
|
needquote = False
|
|
for arg in seq:
|
|
bs_buf = []
|
|
|
|
# Add a space to separate this argument from the others
|
|
if result:
|
|
result.append(' ')
|
|
|
|
needquote = (" " in arg) or ("\t" in arg)
|
|
if needquote:
|
|
result.append('"')
|
|
|
|
for c in arg:
|
|
if c == '\\':
|
|
# Don't know if we need to double yet.
|
|
bs_buf.append(c)
|
|
elif c == '"':
|
|
# Double backspaces.
|
|
result.append('\\' * len(bs_buf)*2)
|
|
bs_buf = []
|
|
result.append('\\"')
|
|
else:
|
|
# Normal char
|
|
if bs_buf:
|
|
result.extend(bs_buf)
|
|
bs_buf = []
|
|
result.append(c)
|
|
|
|
# Add remaining backspaces, if any.
|
|
if bs_buf:
|
|
result.extend(bs_buf)
|
|
|
|
if needquote:
|
|
result.extend(bs_buf)
|
|
result.append('"')
|
|
|
|
return ''.join(result)
|
|
|
|
|
|
class Popen(object):
|
|
def __init__(self, args, bufsize=0, executable=None,
|
|
stdin=None, stdout=None, stderr=None,
|
|
preexec_fn=None, close_fds=False, shell=False,
|
|
cwd=None, env=None, universal_newlines=False,
|
|
startupinfo=None, creationflags=0):
|
|
"""Create new Popen instance."""
|
|
_cleanup()
|
|
|
|
self._child_created = False
|
|
if not isinstance(bufsize, (int, long)):
|
|
raise TypeError("bufsize must be an integer")
|
|
|
|
if mswindows:
|
|
if preexec_fn is not None:
|
|
raise ValueError("preexec_fn is not supported on Windows "
|
|
"platforms")
|
|
if close_fds:
|
|
raise ValueError("close_fds is not supported on Windows "
|
|
"platforms")
|
|
else:
|
|
# POSIX
|
|
if startupinfo is not None:
|
|
raise ValueError("startupinfo is only supported on Windows "
|
|
"platforms")
|
|
if creationflags != 0:
|
|
raise ValueError("creationflags is only supported on Windows "
|
|
"platforms")
|
|
|
|
self.stdin = None
|
|
self.stdout = None
|
|
self.stderr = None
|
|
self.pid = None
|
|
self.returncode = None
|
|
self.universal_newlines = universal_newlines
|
|
|
|
# Input and output objects. The general principle is like
|
|
# this:
|
|
#
|
|
# Parent Child
|
|
# ------ -----
|
|
# p2cwrite ---stdin---> p2cread
|
|
# c2pread <--stdout--- c2pwrite
|
|
# errread <--stderr--- errwrite
|
|
#
|
|
# On POSIX, the child objects are file descriptors. On
|
|
# Windows, these are Windows file handles. The parent objects
|
|
# are file descriptors on both platforms. The parent objects
|
|
# are None when not using PIPEs. The child objects are None
|
|
# when not redirecting.
|
|
|
|
(p2cread, p2cwrite,
|
|
c2pread, c2pwrite,
|
|
errread, errwrite) = self._get_handles(stdin, stdout, stderr)
|
|
|
|
self._execute_child(args, executable, preexec_fn, close_fds,
|
|
cwd, env, universal_newlines,
|
|
startupinfo, creationflags, shell,
|
|
p2cread, p2cwrite,
|
|
c2pread, c2pwrite,
|
|
errread, errwrite)
|
|
|
|
if p2cwrite:
|
|
self.stdin = os.fdopen(p2cwrite, 'wb', bufsize)
|
|
if c2pread:
|
|
if universal_newlines:
|
|
self.stdout = os.fdopen(c2pread, 'rU', bufsize)
|
|
else:
|
|
self.stdout = os.fdopen(c2pread, 'rb', bufsize)
|
|
if errread:
|
|
if universal_newlines:
|
|
self.stderr = os.fdopen(errread, 'rU', bufsize)
|
|
else:
|
|
self.stderr = os.fdopen(errread, 'rb', bufsize)
|
|
|
|
|
|
def _translate_newlines(self, data):
|
|
data = data.replace("\r\n", "\n")
|
|
data = data.replace("\r", "\n")
|
|
return data
|
|
|
|
|
|
def __del__(self):
|
|
if not self._child_created:
|
|
# We didn't get to successfully create a child process.
|
|
return
|
|
# In case the child hasn't been waited on, check if it's done.
|
|
self.poll(_deadstate=sys.maxint)
|
|
if self.returncode is None:
|
|
# Child is still running, keep us alive until we can wait on it.
|
|
_active.append(self)
|
|
|
|
|
|
def communicate(self, input=None):
|
|
"""Interact with process: Send data to stdin. Read data from
|
|
stdout and stderr, until end-of-file is reached. Wait for
|
|
process to terminate. The optional input argument should be a
|
|
string to be sent to the child process, or None, if no data
|
|
should be sent to the child.
|
|
|
|
communicate() returns a tuple (stdout, stderr)."""
|
|
|
|
# Optimization: If we are only using one pipe, or no pipe at
|
|
# all, using select() or threads is unnecessary.
|
|
if [self.stdin, self.stdout, self.stderr].count(None) >= 2:
|
|
stdout = None
|
|
stderr = None
|
|
if self.stdin:
|
|
if input:
|
|
self.stdin.write(input)
|
|
self.stdin.close()
|
|
elif self.stdout:
|
|
stdout = self.stdout.read()
|
|
elif self.stderr:
|
|
stderr = self.stderr.read()
|
|
self.wait()
|
|
return (stdout, stderr)
|
|
|
|
return self._communicate(input)
|
|
|
|
|
|
if mswindows:
|
|
#
|
|
# Windows methods
|
|
#
|
|
def _get_handles(self, stdin, stdout, stderr):
|
|
"""Construct and return tupel with IO objects:
|
|
p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
|
|
"""
|
|
if stdin is None and stdout is None and stderr is None:
|
|
return (None, None, None, None, None, None)
|
|
|
|
p2cread, p2cwrite = None, None
|
|
c2pread, c2pwrite = None, None
|
|
errread, errwrite = None, None
|
|
|
|
if stdin is None:
|
|
p2cread = GetStdHandle(STD_INPUT_HANDLE)
|
|
elif stdin == PIPE:
|
|
p2cread, p2cwrite = CreatePipe(None, 0)
|
|
# Detach and turn into fd
|
|
p2cwrite = p2cwrite.Detach()
|
|
p2cwrite = msvcrt.open_osfhandle(p2cwrite, 0)
|
|
elif isinstance(stdin, int):
|
|
p2cread = msvcrt.get_osfhandle(stdin)
|
|
else:
|
|
# Assuming file-like object
|
|
p2cread = msvcrt.get_osfhandle(stdin.fileno())
|
|
p2cread = self._make_inheritable(p2cread)
|
|
|
|
if stdout is None:
|
|
c2pwrite = GetStdHandle(STD_OUTPUT_HANDLE)
|
|
elif stdout == PIPE:
|
|
c2pread, c2pwrite = CreatePipe(None, 0)
|
|
# Detach and turn into fd
|
|
c2pread = c2pread.Detach()
|
|
c2pread = msvcrt.open_osfhandle(c2pread, 0)
|
|
elif isinstance(stdout, int):
|
|
c2pwrite = msvcrt.get_osfhandle(stdout)
|
|
else:
|
|
# Assuming file-like object
|
|
c2pwrite = msvcrt.get_osfhandle(stdout.fileno())
|
|
c2pwrite = self._make_inheritable(c2pwrite)
|
|
|
|
if stderr is None:
|
|
errwrite = GetStdHandle(STD_ERROR_HANDLE)
|
|
elif stderr == PIPE:
|
|
errread, errwrite = CreatePipe(None, 0)
|
|
# Detach and turn into fd
|
|
errread = errread.Detach()
|
|
errread = msvcrt.open_osfhandle(errread, 0)
|
|
elif stderr == STDOUT:
|
|
errwrite = c2pwrite
|
|
elif isinstance(stderr, int):
|
|
errwrite = msvcrt.get_osfhandle(stderr)
|
|
else:
|
|
# Assuming file-like object
|
|
errwrite = msvcrt.get_osfhandle(stderr.fileno())
|
|
errwrite = self._make_inheritable(errwrite)
|
|
|
|
return (p2cread, p2cwrite,
|
|
c2pread, c2pwrite,
|
|
errread, errwrite)
|
|
|
|
|
|
def _make_inheritable(self, handle):
|
|
"""Return a duplicate of handle, which is inheritable"""
|
|
return DuplicateHandle(GetCurrentProcess(), handle,
|
|
GetCurrentProcess(), 0, 1,
|
|
DUPLICATE_SAME_ACCESS)
|
|
|
|
|
|
def _find_w9xpopen(self):
|
|
"""Find and return absolut path to w9xpopen.exe"""
|
|
w9xpopen = os.path.join(os.path.dirname(GetModuleFileName(0)),
|
|
"w9xpopen.exe")
|
|
if not os.path.exists(w9xpopen):
|
|
# Eeek - file-not-found - possibly an embedding
|
|
# situation - see if we can locate it in sys.exec_prefix
|
|
w9xpopen = os.path.join(os.path.dirname(sys.exec_prefix),
|
|
"w9xpopen.exe")
|
|
if not os.path.exists(w9xpopen):
|
|
raise RuntimeError("Cannot locate w9xpopen.exe, which is "
|
|
"needed for Popen to work with your "
|
|
"shell or platform.")
|
|
return w9xpopen
|
|
|
|
|
|
def _execute_child(self, args, executable, preexec_fn, close_fds,
|
|
cwd, env, universal_newlines,
|
|
startupinfo, creationflags, shell,
|
|
p2cread, p2cwrite,
|
|
c2pread, c2pwrite,
|
|
errread, errwrite):
|
|
"""Execute program (MS Windows version)"""
|
|
|
|
if not isinstance(args, types.StringTypes):
|
|
args = list2cmdline(args)
|
|
|
|
# Process startup details
|
|
if startupinfo is None:
|
|
startupinfo = STARTUPINFO()
|
|
if None not in (p2cread, c2pwrite, errwrite):
|
|
startupinfo.dwFlags |= STARTF_USESTDHANDLES
|
|
startupinfo.hStdInput = p2cread
|
|
startupinfo.hStdOutput = c2pwrite
|
|
startupinfo.hStdError = errwrite
|
|
|
|
if shell:
|
|
startupinfo.dwFlags |= STARTF_USESHOWWINDOW
|
|
startupinfo.wShowWindow = SW_HIDE
|
|
comspec = os.environ.get("COMSPEC", "cmd.exe")
|
|
args = comspec + " /c " + args
|
|
if (GetVersion() >= 0x80000000L or
|
|
os.path.basename(comspec).lower() == "command.com"):
|
|
# Win9x, or using command.com on NT. We need to
|
|
# use the w9xpopen intermediate program. For more
|
|
# information, see KB Q150956
|
|
# (http://web.archive.org/web/20011105084002/http://support.microsoft.com/support/kb/articles/Q150/9/56.asp)
|
|
w9xpopen = self._find_w9xpopen()
|
|
args = '"%s" %s' % (w9xpopen, args)
|
|
# Not passing CREATE_NEW_CONSOLE has been known to
|
|
# cause random failures on win9x. Specifically a
|
|
# dialog: "Your program accessed mem currently in
|
|
# use at xxx" and a hopeful warning about the
|
|
# stability of your system. Cost is Ctrl+C wont
|
|
# kill children.
|
|
creationflags |= CREATE_NEW_CONSOLE
|
|
|
|
# Start the process
|
|
try:
|
|
hp, ht, pid, tid = CreateProcess(executable, args,
|
|
# no special security
|
|
None, None,
|
|
# must inherit handles to pass std
|
|
# handles
|
|
1,
|
|
creationflags,
|
|
env,
|
|
cwd,
|
|
startupinfo)
|
|
except pywintypes.error, e:
|
|
# Translate pywintypes.error to WindowsError, which is
|
|
# a subclass of OSError. FIXME: We should really
|
|
# translate errno using _sys_errlist (or simliar), but
|
|
# how can this be done from Python?
|
|
raise WindowsError(*e.args)
|
|
|
|
# Retain the process handle, but close the thread handle
|
|
self._child_created = True
|
|
self._handle = hp
|
|
self.pid = pid
|
|
ht.Close()
|
|
|
|
# Child is launched. Close the parent's copy of those pipe
|
|
# handles that only the child should have open. You need
|
|
# to make sure that no handles to the write end of the
|
|
# output pipe are maintained in this process or else the
|
|
# pipe will not close when the child process exits and the
|
|
# ReadFile will hang.
|
|
if p2cread is not None:
|
|
p2cread.Close()
|
|
if c2pwrite is not None:
|
|
c2pwrite.Close()
|
|
if errwrite is not None:
|
|
errwrite.Close()
|
|
|
|
|
|
def poll(self, _deadstate=None):
|
|
"""Check if child process has terminated. Returns returncode
|
|
attribute."""
|
|
if self.returncode is None:
|
|
if WaitForSingleObject(self._handle, 0) == WAIT_OBJECT_0:
|
|
self.returncode = GetExitCodeProcess(self._handle)
|
|
return self.returncode
|
|
|
|
|
|
def wait(self):
|
|
"""Wait for child process to terminate. Returns returncode
|
|
attribute."""
|
|
if self.returncode is None:
|
|
obj = WaitForSingleObject(self._handle, INFINITE)
|
|
self.returncode = GetExitCodeProcess(self._handle)
|
|
return self.returncode
|
|
|
|
|
|
def _readerthread(self, fh, buffer):
|
|
buffer.append(fh.read())
|
|
|
|
|
|
def _communicate(self, input):
|
|
stdout = None # Return
|
|
stderr = None # Return
|
|
|
|
if self.stdout:
|
|
stdout = []
|
|
stdout_thread = threading.Thread(target=self._readerthread,
|
|
args=(self.stdout, stdout))
|
|
stdout_thread.setDaemon(True)
|
|
stdout_thread.start()
|
|
if self.stderr:
|
|
stderr = []
|
|
stderr_thread = threading.Thread(target=self._readerthread,
|
|
args=(self.stderr, stderr))
|
|
stderr_thread.setDaemon(True)
|
|
stderr_thread.start()
|
|
|
|
if self.stdin:
|
|
if input is not None:
|
|
self.stdin.write(input)
|
|
self.stdin.close()
|
|
|
|
if self.stdout:
|
|
stdout_thread.join()
|
|
if self.stderr:
|
|
stderr_thread.join()
|
|
|
|
# All data exchanged. Translate lists into strings.
|
|
if stdout is not None:
|
|
stdout = stdout[0]
|
|
if stderr is not None:
|
|
stderr = stderr[0]
|
|
|
|
# Translate newlines, if requested. We cannot let the file
|
|
# object do the translation: It is based on stdio, which is
|
|
# impossible to combine with select (unless forcing no
|
|
# buffering).
|
|
if self.universal_newlines and hasattr(file, 'newlines'):
|
|
if stdout:
|
|
stdout = self._translate_newlines(stdout)
|
|
if stderr:
|
|
stderr = self._translate_newlines(stderr)
|
|
|
|
self.wait()
|
|
return (stdout, stderr)
|
|
|
|
else:
|
|
#
|
|
# POSIX methods
|
|
#
|
|
def _get_handles(self, stdin, stdout, stderr):
|
|
"""Construct and return tupel with IO objects:
|
|
p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
|
|
"""
|
|
p2cread, p2cwrite = None, None
|
|
c2pread, c2pwrite = None, None
|
|
errread, errwrite = None, None
|
|
|
|
if stdin is None:
|
|
pass
|
|
elif stdin == PIPE:
|
|
p2cread, p2cwrite = os.pipe()
|
|
elif isinstance(stdin, int):
|
|
p2cread = stdin
|
|
else:
|
|
# Assuming file-like object
|
|
p2cread = stdin.fileno()
|
|
|
|
if stdout is None:
|
|
pass
|
|
elif stdout == PIPE:
|
|
c2pread, c2pwrite = os.pipe()
|
|
elif isinstance(stdout, int):
|
|
c2pwrite = stdout
|
|
else:
|
|
# Assuming file-like object
|
|
c2pwrite = stdout.fileno()
|
|
|
|
if stderr is None:
|
|
pass
|
|
elif stderr == PIPE:
|
|
errread, errwrite = os.pipe()
|
|
elif stderr == STDOUT:
|
|
errwrite = c2pwrite
|
|
elif isinstance(stderr, int):
|
|
errwrite = stderr
|
|
else:
|
|
# Assuming file-like object
|
|
errwrite = stderr.fileno()
|
|
|
|
return (p2cread, p2cwrite,
|
|
c2pread, c2pwrite,
|
|
errread, errwrite)
|
|
|
|
|
|
def _set_cloexec_flag(self, fd):
|
|
try:
|
|
cloexec_flag = fcntl.FD_CLOEXEC
|
|
except AttributeError:
|
|
cloexec_flag = 1
|
|
|
|
old = fcntl.fcntl(fd, fcntl.F_GETFD)
|
|
fcntl.fcntl(fd, fcntl.F_SETFD, old | cloexec_flag)
|
|
|
|
|
|
def _close_fds(self, but):
|
|
for i in range(3, MAXFD):
|
|
if i == but:
|
|
continue
|
|
try:
|
|
os.close(i)
|
|
except:
|
|
pass
|
|
|
|
|
|
def _execute_child(self, args, executable, preexec_fn, close_fds,
|
|
cwd, env, universal_newlines,
|
|
startupinfo, creationflags, shell,
|
|
p2cread, p2cwrite,
|
|
c2pread, c2pwrite,
|
|
errread, errwrite):
|
|
"""Execute program (POSIX version)"""
|
|
|
|
if isinstance(args, types.StringTypes):
|
|
args = [args]
|
|
|
|
if shell:
|
|
args = ["/bin/sh", "-c"] + args
|
|
|
|
if executable is None:
|
|
executable = args[0]
|
|
|
|
# For transferring possible exec failure from child to parent
|
|
# The first char specifies the exception type: 0 means
|
|
# OSError, 1 means some other error.
|
|
errpipe_read, errpipe_write = os.pipe()
|
|
self._set_cloexec_flag(errpipe_write)
|
|
|
|
self.pid = os.fork()
|
|
self._child_created = True
|
|
if self.pid == 0:
|
|
# Child
|
|
try:
|
|
# Close parent's pipe ends
|
|
if p2cwrite:
|
|
os.close(p2cwrite)
|
|
if c2pread:
|
|
os.close(c2pread)
|
|
if errread:
|
|
os.close(errread)
|
|
os.close(errpipe_read)
|
|
|
|
# Dup fds for child
|
|
if p2cread:
|
|
os.dup2(p2cread, 0)
|
|
if c2pwrite:
|
|
os.dup2(c2pwrite, 1)
|
|
if errwrite:
|
|
os.dup2(errwrite, 2)
|
|
|
|
# Close pipe fds. Make sure we doesn't close the same
|
|
# fd more than once.
|
|
if p2cread:
|
|
os.close(p2cread)
|
|
if c2pwrite and c2pwrite not in (p2cread,):
|
|
os.close(c2pwrite)
|
|
if errwrite and errwrite not in (p2cread, c2pwrite):
|
|
os.close(errwrite)
|
|
|
|
# Close all other fds, if asked for
|
|
if close_fds:
|
|
self._close_fds(but=errpipe_write)
|
|
|
|
if cwd is not None:
|
|
os.chdir(cwd)
|
|
|
|
if preexec_fn:
|
|
preexec_fn()
|
|
|
|
if env is None:
|
|
os.execvp(executable, args)
|
|
else:
|
|
os.execvpe(executable, args, env)
|
|
|
|
except:
|
|
exc_type, exc_value, tb = sys.exc_info()
|
|
# Save the traceback and attach it to the exception object
|
|
exc_lines = traceback.format_exception(exc_type,
|
|
exc_value,
|
|
tb)
|
|
exc_value.child_traceback = ''.join(exc_lines)
|
|
os.write(errpipe_write, pickle.dumps(exc_value))
|
|
|
|
# This exitcode won't be reported to applications, so it
|
|
# really doesn't matter what we return.
|
|
os._exit(255)
|
|
|
|
# Parent
|
|
os.close(errpipe_write)
|
|
if p2cread and p2cwrite:
|
|
os.close(p2cread)
|
|
if c2pwrite and c2pread:
|
|
os.close(c2pwrite)
|
|
if errwrite and errread:
|
|
os.close(errwrite)
|
|
|
|
# Wait for exec to fail or succeed; possibly raising exception
|
|
data = os.read(errpipe_read, 1048576) # Exceptions limited to 1 MB
|
|
os.close(errpipe_read)
|
|
if data != "":
|
|
os.waitpid(self.pid, 0)
|
|
child_exception = pickle.loads(data)
|
|
raise child_exception
|
|
|
|
|
|
def _handle_exitstatus(self, sts):
|
|
if os.WIFSIGNALED(sts):
|
|
self.returncode = -os.WTERMSIG(sts)
|
|
elif os.WIFEXITED(sts):
|
|
self.returncode = os.WEXITSTATUS(sts)
|
|
else:
|
|
# Should never happen
|
|
raise RuntimeError("Unknown child exit status!")
|
|
|
|
|
|
def poll(self, _deadstate=None):
|
|
"""Check if child process has terminated. Returns returncode
|
|
attribute."""
|
|
if self.returncode is None:
|
|
try:
|
|
pid, sts = os.waitpid(self.pid, os.WNOHANG)
|
|
if pid == self.pid:
|
|
self._handle_exitstatus(sts)
|
|
except os.error:
|
|
if _deadstate is not None:
|
|
self.returncode = _deadstate
|
|
return self.returncode
|
|
|
|
|
|
def wait(self):
|
|
"""Wait for child process to terminate. Returns returncode
|
|
attribute."""
|
|
if self.returncode is None:
|
|
pid, sts = os.waitpid(self.pid, 0)
|
|
self._handle_exitstatus(sts)
|
|
return self.returncode
|
|
|
|
|
|
def _communicate(self, input):
|
|
read_set = []
|
|
write_set = []
|
|
stdout = None # Return
|
|
stderr = None # Return
|
|
|
|
if self.stdin:
|
|
# Flush stdio buffer. This might block, if the user has
|
|
# been writing to .stdin in an uncontrolled fashion.
|
|
self.stdin.flush()
|
|
if input:
|
|
write_set.append(self.stdin)
|
|
else:
|
|
self.stdin.close()
|
|
if self.stdout:
|
|
read_set.append(self.stdout)
|
|
stdout = []
|
|
if self.stderr:
|
|
read_set.append(self.stderr)
|
|
stderr = []
|
|
|
|
while read_set or write_set:
|
|
rlist, wlist, xlist = select.select(read_set, write_set, [])
|
|
|
|
if self.stdin in wlist:
|
|
# When select has indicated that the file is writable,
|
|
# we can write up to PIPE_BUF bytes without risk
|
|
# blocking. POSIX defines PIPE_BUF >= 512
|
|
bytes_written = os.write(self.stdin.fileno(), input[:512])
|
|
input = input[bytes_written:]
|
|
if not input:
|
|
self.stdin.close()
|
|
write_set.remove(self.stdin)
|
|
|
|
if self.stdout in rlist:
|
|
data = os.read(self.stdout.fileno(), 1024)
|
|
if data == "":
|
|
self.stdout.close()
|
|
read_set.remove(self.stdout)
|
|
stdout.append(data)
|
|
|
|
if self.stderr in rlist:
|
|
data = os.read(self.stderr.fileno(), 1024)
|
|
if data == "":
|
|
self.stderr.close()
|
|
read_set.remove(self.stderr)
|
|
stderr.append(data)
|
|
|
|
# All data exchanged. Translate lists into strings.
|
|
if stdout is not None:
|
|
stdout = ''.join(stdout)
|
|
if stderr is not None:
|
|
stderr = ''.join(stderr)
|
|
|
|
# Translate newlines, if requested. We cannot let the file
|
|
# object do the translation: It is based on stdio, which is
|
|
# impossible to combine with select (unless forcing no
|
|
# buffering).
|
|
if self.universal_newlines and hasattr(file, 'newlines'):
|
|
if stdout:
|
|
stdout = self._translate_newlines(stdout)
|
|
if stderr:
|
|
stderr = self._translate_newlines(stderr)
|
|
|
|
self.wait()
|
|
return (stdout, stderr)
|
|
|
|
|
|
def _demo_posix():
|
|
#
|
|
# Example 1: Simple redirection: Get process list
|
|
#
|
|
plist = Popen(["ps"], stdout=PIPE).communicate()[0]
|
|
print "Process list:"
|
|
print plist
|
|
|
|
#
|
|
# Example 2: Change uid before executing child
|
|
#
|
|
if os.getuid() == 0:
|
|
p = Popen(["id"], preexec_fn=lambda: os.setuid(100))
|
|
p.wait()
|
|
|
|
#
|
|
# Example 3: Connecting several subprocesses
|
|
#
|
|
print "Looking for 'hda'..."
|
|
p1 = Popen(["dmesg"], stdout=PIPE)
|
|
p2 = Popen(["grep", "hda"], stdin=p1.stdout, stdout=PIPE)
|
|
print repr(p2.communicate()[0])
|
|
|
|
#
|
|
# Example 4: Catch execution error
|
|
#
|
|
print
|
|
print "Trying a weird file..."
|
|
try:
|
|
print Popen(["/this/path/does/not/exist"]).communicate()
|
|
except OSError, e:
|
|
if e.errno == errno.ENOENT:
|
|
print "The file didn't exist. I thought so..."
|
|
print "Child traceback:"
|
|
print e.child_traceback
|
|
else:
|
|
print "Error", e.errno
|
|
else:
|
|
print >>sys.stderr, "Gosh. No error."
|
|
|
|
|
|
def _demo_windows():
|
|
#
|
|
# Example 1: Connecting several subprocesses
|
|
#
|
|
print "Looking for 'PROMPT' in set output..."
|
|
p1 = Popen("set", stdout=PIPE, shell=True)
|
|
p2 = Popen('find "PROMPT"', stdin=p1.stdout, stdout=PIPE)
|
|
print repr(p2.communicate()[0])
|
|
|
|
#
|
|
# Example 2: Simple execution of program
|
|
#
|
|
print "Executing calc..."
|
|
p = Popen("calc")
|
|
p.wait()
|
|
|
|
|
|
if __name__ == "__main__":
|
|
if mswindows:
|
|
_demo_windows()
|
|
else:
|
|
_demo_posix()
|