mirror of
https://github.com/python/cpython.git
synced 2025-09-03 07:28:59 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r53954 | jeremy.hylton | 2007-02-26 10:41:18 -0800 (Mon, 26 Feb 2007) | 10 lines Do not copy free variables to locals in class namespaces. Fixes bug 1569356, but at the cost of a minor incompatibility in locals(). Add test that verifies that the class namespace is not polluted. Also clarify the behavior in the library docs. Along the way, cleaned up the dict_to_map and map_to_dict implementations and added some comments that explain what they do. ........ r53955 | jeremy.hylton | 2007-02-26 11:00:20 -0800 (Mon, 26 Feb 2007) | 2 lines Fix assertion. ........ r53969 | neal.norwitz | 2007-02-26 14:41:45 -0800 (Mon, 26 Feb 2007) | 3 lines When printing an unraisable error, don't print exceptions. before the name. This duplicates the behavior whening normally printing exceptions. ........ r53970 | andrew.kuchling | 2007-02-26 15:02:47 -0800 (Mon, 26 Feb 2007) | 1 line Markup fix ........ r53975 | neal.norwitz | 2007-02-26 15:48:27 -0800 (Mon, 26 Feb 2007) | 3 lines SF #1669182, 2.5 was already fixed. Just assert in 2.6 since string exceptions are gone. ........ r53976 | andrew.kuchling | 2007-02-26 15:54:17 -0800 (Mon, 26 Feb 2007) | 1 line Add some items ........ r53981 | jeremy.hylton | 2007-02-26 17:01:59 -0800 (Mon, 26 Feb 2007) | 4 lines Fix long-standing bug in name mangling for package imports Reported by Mike Verdone. ........ r53993 | jeremy.hylton | 2007-02-27 08:00:06 -0800 (Tue, 27 Feb 2007) | 2 lines tabify ........ r53994 | jeremy.hylton | 2007-02-27 08:13:23 -0800 (Tue, 27 Feb 2007) | 5 lines tabify Note that ast.c still has a mix of tabs and spaces, because it attempts to use four-space indents for more of the new code. ........ r53996 | jeremy.hylton | 2007-02-27 09:24:48 -0800 (Tue, 27 Feb 2007) | 2 lines whitespace normalization ........ r53997 | jeremy.hylton | 2007-02-27 10:29:45 -0800 (Tue, 27 Feb 2007) | 24 lines Add checking for a number of metaclass error conditions. We add some new rules that are required for preserving internal invariants of types. 1. If type (or a subclass of type) appears in bases, it must appear before any non-type bases. If a non-type base (like a regular new-style class) occurred first, it could trick type into allocating the new class an __dict__ which must be impossible. 2. There are several checks that are made of bases when creating a type. Those checks are now repeated when assigning to __bases__. We also add the restriction that assignment to __bases__ may not change the metaclass of the type. Add new tests for these cases and for a few other oddball errors that were no previously tested. Remove a crasher test that was fixed. Also some internal refactoring: Extract the code to find the most derived metaclass of a type and its bases. It is now needed in two places. Rewrite the TypeError checks in test_descr to use doctest. The tests now clearly show what exception they expect to see. ........ r53998 | jeremy.hylton | 2007-02-27 10:33:31 -0800 (Tue, 27 Feb 2007) | 2 lines Add news about changes to metaclasses and __bases__ error checking. ........ r54016 | armin.rigo | 2007-02-28 01:25:29 -0800 (Wed, 28 Feb 2007) | 3 lines Modify the segfaulting example to show why r53997 is not a solution to it. ........ r54022 | brett.cannon | 2007-02-28 10:15:00 -0800 (Wed, 28 Feb 2007) | 2 lines Add a test for instantiating SyntaxError with no arguments. ........ r54026 | raymond.hettinger | 2007-02-28 10:27:41 -0800 (Wed, 28 Feb 2007) | 1 line Docstring nit. ........ r54033 | raymond.hettinger | 2007-02-28 10:37:52 -0800 (Wed, 28 Feb 2007) | 1 line Prepare collections module for pure python code entries. ........ r54053 | raymond.hettinger | 2007-02-28 22:16:43 -0800 (Wed, 28 Feb 2007) | 1 line Add collections.NamedTuple ........ r54054 | neal.norwitz | 2007-02-28 23:04:41 -0800 (Wed, 28 Feb 2007) | 1 line Add Pat and Eric for work on PEP 3101 in the sandbox ........ r54061 | andrew.kuchling | 2007-03-01 06:36:12 -0800 (Thu, 01 Mar 2007) | 1 line Add NamedTuple ........ r54080 | georg.brandl | 2007-03-02 06:37:12 -0800 (Fri, 02 Mar 2007) | 2 lines Bug #1628895: some better tries to find HTML documentation in pydoc. ........ r54086 | raymond.hettinger | 2007-03-02 11:20:46 -0800 (Fri, 02 Mar 2007) | 1 line Fix embarrassing typo and fix constantification of None ........ r54088 | georg.brandl | 2007-03-02 12:30:14 -0800 (Fri, 02 Mar 2007) | 2 lines Bugs #1668032, #1668036, #1669304: clarify behavior of PyMem_Realloc and _Resize. ........ r54114 | georg.brandl | 2007-03-04 09:18:54 -0800 (Sun, 04 Mar 2007) | 2 lines Fix a bug in test_dict and test_userdict, found at the PyPy sprint. ........ r54124 | skip.montanaro | 2007-03-04 12:52:28 -0800 (Sun, 04 Mar 2007) | 2 lines Teach setup.py how to find Berkeley DB on Macs using MacPorts. ........ r54125 | skip.montanaro | 2007-03-04 12:54:12 -0800 (Sun, 04 Mar 2007) | 1 line note MacPorts/BerkDB change in setup.py ........ r54136 | neal.norwitz | 2007-03-04 23:52:01 -0800 (Sun, 04 Mar 2007) | 1 line Added Pete for 3101 too ........ r54138 | facundo.batista | 2007-03-05 08:31:54 -0800 (Mon, 05 Mar 2007) | 1 line Minor corrections to docs, and an explanation comentary ........ r54139 | georg.brandl | 2007-03-05 14:28:08 -0800 (Mon, 05 Mar 2007) | 3 lines Patch #1674228: when assigning a slice (old-style), check for the sq_ass_slice instead of the sq_slice slot. ........ r54149 | georg.brandl | 2007-03-06 01:33:01 -0800 (Tue, 06 Mar 2007) | 3 lines Nit: a struct field is set to GenericAlloc, not GenericAlloc(). ........ r54150 | georg.brandl | 2007-03-06 02:02:47 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1671450: add a section about subclassing builtin types to the "extending and embedding" tutorial. ........ r54152 | martin.v.loewis | 2007-03-06 02:41:24 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1121142: Implement ZipFile.open. ........ r54154 | georg.brandl | 2007-03-06 03:51:14 -0800 (Tue, 06 Mar 2007) | 2 lines A test case for the fix in #1674228. ........ r54156 | georg.brandl | 2007-03-06 03:52:24 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1672481: fix bug in idlelib.MultiCall. ........ r54159 | georg.brandl | 2007-03-06 04:17:50 -0800 (Tue, 06 Mar 2007) | 1 line Bug #1674503: close the file opened by execfile() in an error condition. ........ r54160 | georg.brandl | 2007-03-06 05:32:52 -0800 (Tue, 06 Mar 2007) | 3 lines Fix another reincarnation of bug #1576657 in defaultdict. ........ r54162 | georg.brandl | 2007-03-06 05:35:00 -0800 (Tue, 06 Mar 2007) | 2 lines A test case for the defaultdict KeyError bug. ........ r54164 | georg.brandl | 2007-03-06 05:37:45 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1663234: you can now run doctest on test files and modules using "python -m doctest [-v] filename ...". ........ r54165 | martin.v.loewis | 2007-03-06 06:43:00 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #912410: Replace HTML entity references for attribute values in HTMLParser. ........ r54166 | skip.montanaro | 2007-03-06 07:41:38 -0800 (Tue, 06 Mar 2007) | 1 line patch 1673619 - identify extension modules which cannot be built ........ r54167 | guido.van.rossum | 2007-03-06 07:50:01 -0800 (Tue, 06 Mar 2007) | 5 lines Patch #1646728: datetime.fromtimestamp fails with negative fractional times. With unittest. Somebody please backport to 2.5. ........ r54169 | georg.brandl | 2007-03-06 09:49:14 -0800 (Tue, 06 Mar 2007) | 2 lines Fix cmp vs. key argument for list.sort. ........ r54170 | georg.brandl | 2007-03-06 10:21:32 -0800 (Tue, 06 Mar 2007) | 2 lines Small nit, found by Neal. ........ r54171 | georg.brandl | 2007-03-06 10:29:58 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1602128: clarify that richcmp methods can return NotImplemented and should return True or False otherwise. ........ r54173 | georg.brandl | 2007-03-06 10:41:12 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1638879: don't accept strings with embedded NUL bytes in long(). ........ r54175 | georg.brandl | 2007-03-06 10:47:31 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1673121: update README wrt. OSX default shell. ........ r54177 | georg.brandl | 2007-03-06 10:59:11 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1654417: make operator.{get,set,del}slice use the full range of Py_ssize_t. ........ r54180 | walter.doerwald | 2007-03-06 12:38:57 -0800 (Tue, 06 Mar 2007) | 4 lines Patch for bug #1633621: if curses.resizeterm() or curses.resize_term() is called, update _curses.LINES, _curses.COLS, curses.LINES and curses.COLS. ........ r54182 | walter.doerwald | 2007-03-06 13:15:24 -0800 (Tue, 06 Mar 2007) | 2 lines Document change to curses. ........ r54188 | georg.brandl | 2007-03-06 16:34:46 -0800 (Tue, 06 Mar 2007) | 5 lines Variant of patch #697613: don't exit the interpreter on a SystemExit exception if the -i command line option or PYTHONINSPECT environment variable is given, but break into the interactive interpreter just like on other exceptions or normal program exit. (backport) ........ r54189 | georg.brandl | 2007-03-06 16:40:28 -0800 (Tue, 06 Mar 2007) | 4 lines Patch #703779: unset __file__ in __main__ after running a file. This makes the filenames the warning module prints much more sensible when a PYTHONSTARTUP file is used. ........ r54192 | george.yoshida | 2007-03-06 20:21:18 -0800 (Tue, 06 Mar 2007) | 2 lines add versionadded info ........ r54195 | georg.brandl | 2007-03-06 23:39:06 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #812285: allow multiple auth schemes in AbstractBasicAuthHandler. ........ r54197 | georg.brandl | 2007-03-07 00:31:51 -0800 (Wed, 07 Mar 2007) | 3 lines Patch #1001604: glob.glob() now returns unicode filenames if it was given a unicode argument and os.listdir() returns unicode filenames. ........ r54199 | georg.brandl | 2007-03-07 01:09:40 -0800 (Wed, 07 Mar 2007) | 3 lines Patches #1550273, #1550272: fix a few bugs in unittest and add a comprehensive test suite for the module. ........ r54201 | georg.brandl | 2007-03-07 01:21:06 -0800 (Wed, 07 Mar 2007) | 3 lines Patch #787789: allow to pass custom TestRunner instances to unittest's main() function. ........ r54202 | georg.brandl | 2007-03-07 01:34:45 -0800 (Wed, 07 Mar 2007) | 2 lines Patch #1669331: clarify shutil.copyfileobj() behavior wrt. file position. ........ r54204 | martin.v.loewis | 2007-03-07 03:04:33 -0800 (Wed, 07 Mar 2007) | 2 lines Bug #1115886: os.path.splitext('.cshrc') gives now ('.cshrc', ''). ........ r54206 | georg.brandl | 2007-03-07 03:37:42 -0800 (Wed, 07 Mar 2007) | 2 lines Patch #1675471: convert test_pty to unittest. ........ r54207 | georg.brandl | 2007-03-07 03:54:49 -0800 (Wed, 07 Mar 2007) | 4 lines Add some sanity checks to unittest.TestSuite's addTest(s) methods. Fixes #878275. ........ r54209 | guido.van.rossum | 2007-03-07 07:16:29 -0800 (Wed, 07 Mar 2007) | 3 lines Windows doesn't support negative timestamps. Skip the tests involving them if os.name == "nt". ........ r54219 | martin.v.loewis | 2007-03-08 05:42:43 -0800 (Thu, 08 Mar 2007) | 2 lines Add missing ) in parenthical remark. ........ r54220 | georg.brandl | 2007-03-08 09:49:06 -0800 (Thu, 08 Mar 2007) | 2 lines Fix #1676656: \em is different from \emph... ........ r54222 | georg.brandl | 2007-03-08 10:37:31 -0800 (Thu, 08 Mar 2007) | 2 lines Add a NEWS entry for rev. 54207,8. ........ r54225 | raymond.hettinger | 2007-03-08 11:24:27 -0800 (Thu, 08 Mar 2007) | 1 line SF 1676321: empty() returned wrong result ........ r54227 | collin.winter | 2007-03-08 11:58:14 -0800 (Thu, 08 Mar 2007) | 1 line Backported r54226 from p3yk: Move test_unittest, test_doctest and test_doctest2 higher up in the testing order. ........ r54230 | raymond.hettinger | 2007-03-08 13:33:47 -0800 (Thu, 08 Mar 2007) | 1 line SF #1637850: make_table in difflib did not work with unicode ........ r54232 | collin.winter | 2007-03-08 14:16:25 -0800 (Thu, 08 Mar 2007) | 1 line Patch #1668482: don't use '-' in mkstemp ........ r54233 | brett.cannon | 2007-03-08 15:58:11 -0800 (Thu, 08 Mar 2007) | 10 lines Introduce test.test_support.TransientResource. It's a context manager to surround calls to resources that may or may not be available. Specifying the expected exception and attributes to be raised if the resource is not available prevents overly broad catching of exceptions. This is meant to help suppress spurious failures by raising test.test_support.ResourceDenied if the exception matches. It would probably be good to go through the various network tests and surround the calls to catch connection timeouts (as done with test_socket_ssl in this commit). ........ r54234 | collin.winter | 2007-03-08 19:15:56 -0800 (Thu, 08 Mar 2007) | 1 line Patch #1481079: Support of HTTP_REFERER in CGIHTTPServer.py ........ r54235 | collin.winter | 2007-03-08 19:26:32 -0800 (Thu, 08 Mar 2007) | 1 line Add NEWS item for patch #1481079 (r54234). ........ r54237 | neal.norwitz | 2007-03-08 21:59:01 -0800 (Thu, 08 Mar 2007) | 1 line Fix SF #1676971, Complex OverflowError has a typo ........ r54239 | georg.brandl | 2007-03-09 04:58:41 -0800 (Fri, 09 Mar 2007) | 2 lines Typo. ........ r54240 | martin.v.loewis | 2007-03-09 07:35:55 -0800 (Fri, 09 Mar 2007) | 2 lines Patch #957003: Implement smtplib.LMTP. ........ r54243 | collin.winter | 2007-03-09 10:09:10 -0800 (Fri, 09 Mar 2007) | 2 lines Bug #1629566: clarify the docs on the return values of parsedate() and parsedate_tz() in email.utils and rfc822. ........ r54244 | thomas.heller | 2007-03-09 11:21:28 -0800 (Fri, 09 Mar 2007) | 3 lines Fix bug #1646630: ctypes.string_at(buf, 0) and ctypes.wstring_at(buf, 0) returned string up to the first NUL character. ........ r54245 | martin.v.loewis | 2007-03-09 11:36:01 -0800 (Fri, 09 Mar 2007) | 2 lines Add Ziga Seilnacht. ........ r54247 | collin.winter | 2007-03-09 12:33:07 -0800 (Fri, 09 Mar 2007) | 2 lines Patch #1491866: change the complex() constructor to allow parthensized forms. This means complex(repr(x)) now works instead of raising a ValueError. ........ r54248 | thomas.heller | 2007-03-09 12:39:22 -0800 (Fri, 09 Mar 2007) | 7 lines Bug #1651235: When a tuple was passed to a ctypes function call, Python would crash instead of raising an error. The crash was caused by a section of code that should have been removed long ago, at that time ctypes had other ways to pass parameters to function calls. ........ r54250 | collin.winter | 2007-03-09 15:30:39 -0800 (Fri, 09 Mar 2007) | 1 line Hashing simplification pointed out by Thomas Wouters. ........ r54252 | collin.winter | 2007-03-09 18:23:40 -0800 (Fri, 09 Mar 2007) | 5 lines * Unlink test files before and after each test; hopefully this will cut down on recent buildbot failures in test_islink. * Drop safe_remove() in favor of test_support.unlink(). * Fix the indentation of test_samefile so that it runs. ........ r54253 | collin.winter | 2007-03-09 18:51:26 -0800 (Fri, 09 Mar 2007) | 3 lines Bug #1531963: Make SocketServer.TCPServer's server_address always be equal to calling getsockname() on the server's socket. Will backport. ........ r54254 | neal.norwitz | 2007-03-09 19:19:18 -0800 (Fri, 09 Mar 2007) | 4 lines Simplify a little by handling the TCP case first. Update to use predominant style of spaces around = in args list and print to stderr if debugging. ........ r54256 | collin.winter | 2007-03-09 19:35:34 -0800 (Fri, 09 Mar 2007) | 1 line Add proper attribution for a bug fix. ........ r54257 | georg.brandl | 2007-03-09 23:38:14 -0800 (Fri, 09 Mar 2007) | 2 lines Typos. ........ r54260 | collin.winter | 2007-03-10 06:33:32 -0800 (Sat, 10 Mar 2007) | 1 line Convert an assert to a raise so it works even in the presence of -O. ........ r54262 | collin.winter | 2007-03-10 06:41:48 -0800 (Sat, 10 Mar 2007) | 2 lines Patch #1599845: Add an option to disable the implicit calls to server_bind() and server_activate() in the constructors for TCPServer, SimpleXMLRPCServer and DocXMLRPCServer. ........ r54268 | georg.brandl | 2007-03-11 00:28:46 -0800 (Sun, 11 Mar 2007) | 2 lines Add missing "return" statements in exception handler. ........ r54270 | ziga.seilnacht | 2007-03-11 08:54:54 -0700 (Sun, 11 Mar 2007) | 3 lines Patch #1675981: remove unreachable code from type.__new__() method. __dict__ and __weakref__ are removed from the slots tuple earlier in the code, in the loop that mangles slot names. Will backport. ........ r54271 | collin.winter | 2007-03-11 09:00:20 -0700 (Sun, 11 Mar 2007) | 3 lines Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap the IndexError caused by passing in an invalid breakpoint number. Will backport. ........ r54274 | vinay.sajip | 2007-03-11 11:32:07 -0700 (Sun, 11 Mar 2007) | 1 line Fix resource leak reported in SF #1516995. ........ r54278 | collin.winter | 2007-03-11 18:55:54 -0700 (Sun, 11 Mar 2007) | 4 lines Patch #1678662: ftp.python.org does not exist. So the testcode in urllib.py must use a more stable FTP. Will backport. ........ r54280 | barry.warsaw | 2007-03-11 20:20:01 -0700 (Sun, 11 Mar 2007) | 8 lines Tokio Kikuchi's fix for SF bug #1629369; folding whitespace allowed in the display name of an email address, e.g. Foo \tBar <foo@example.com> Test case added by Barry. ........ r54282 | skip.montanaro | 2007-03-11 20:30:50 -0700 (Sun, 11 Mar 2007) | 4 lines Sane humans would call these invalid tests, but Andrew McNamara pointed out that given the inputs in these tests Excel does indeed produce the output these tests expect. Document that for future confused folks. ........ r54283 | martin.v.loewis | 2007-03-12 03:50:39 -0700 (Mon, 12 Mar 2007) | 2 lines Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86. ........ r54285 | martin.v.loewis | 2007-03-12 04:01:10 -0700 (Mon, 12 Mar 2007) | 2 lines Patch #1677862: Require a space or tab after import in .pth files. ........ r54287 | georg.brandl | 2007-03-12 06:17:36 -0700 (Mon, 12 Mar 2007) | 8 lines Backport from Py3k branch: Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Had to change a few bits of the patch because classobjs and __methods__ are still in Py2.6. ........ r54288 | georg.brandl | 2007-03-12 07:30:05 -0700 (Mon, 12 Mar 2007) | 3 lines Bug #1678647: write a newline after printing an exception in any case, even when converting the value to a string failed. ........ r54290 | collin.winter | 2007-03-12 08:57:19 -0700 (Mon, 12 Mar 2007) | 1 line Patch #1678088: convert test_operations to use unittest, fold the result into test_dict. ........ r54291 | collin.winter | 2007-03-12 09:11:39 -0700 (Mon, 12 Mar 2007) | 3 lines Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167. Will backport. ........ r54292 | georg.brandl | 2007-03-12 09:15:09 -0700 (Mon, 12 Mar 2007) | 2 lines Typo fix. ........ r54295 | collin.winter | 2007-03-12 10:24:07 -0700 (Mon, 12 Mar 2007) | 1 line Patch #1670993: Refactor test_threadedtempfile.py to use unittest. ........ r54296 | tim.peters | 2007-03-12 11:07:52 -0700 (Mon, 12 Mar 2007) | 2 lines Whitespace normalization. ........ r54297 | tim.peters | 2007-03-12 11:09:22 -0700 (Mon, 12 Mar 2007) | 2 lines Set missing svn:eol-style property on text files. ........ r54315 | brett.cannon | 2007-03-12 19:34:09 -0700 (Mon, 12 Mar 2007) | 8 lines Add test.test_support.transient_internet . Returns a context manager that nests test.test_support.TransientResource context managers that capture exceptions raised when the Internet connection is flaky. Initially using in test_socket_ssl but should probably be expanded to cover any test that should not raise the captured exceptions if the Internet connection works. ........ r54316 | brett.cannon | 2007-03-12 20:05:40 -0700 (Mon, 12 Mar 2007) | 2 lines Fix a typo where the variable name was not updated. ........ r54318 | neal.norwitz | 2007-03-12 21:59:58 -0700 (Mon, 12 Mar 2007) | 1 line Add Jerry Seutter for a bunch of his recent patches refactoring tests ........ r54319 | neal.norwitz | 2007-03-12 22:07:14 -0700 (Mon, 12 Mar 2007) | 7 lines Add some other acks for recent checkins: Brian Leair - 922167 Tomer Filiba - 1591665 Jeremy Jones - 1192590 ........ r54321 | neal.norwitz | 2007-03-12 22:31:38 -0700 (Mon, 12 Mar 2007) | 9 lines Fix some style nits: * lines too long * wrong indentation * space after a function name * wrong function name in error string * simplifying some logic Also add an error check to PyDict_SetItemString. ........ r54322 | georg.brandl | 2007-03-13 00:23:16 -0700 (Tue, 13 Mar 2007) | 2 lines Typo and grammar fixes. ........ r54323 | georg.brandl | 2007-03-13 00:50:57 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1679379: add documentation for fnmatch.translate(). ........ r54325 | georg.brandl | 2007-03-13 00:57:51 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1642844: comments to clarify the complexobject constructor. ........ r54326 | georg.brandl | 2007-03-13 01:14:27 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1668100: urllib2 now correctly raises URLError instead of OSError if accessing a local file via the file:// protocol fails. ........ r54327 | georg.brandl | 2007-03-13 02:32:11 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1635454: the csv.DictWriter class now includes the offending field names in its exception message if you try to write a record with a dictionary containing fields not in the CSV field names list. ........ r54328 | georg.brandl | 2007-03-13 02:41:31 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1555098: use str.join() instead of repeated string concatenation in robotparser. ........ r54329 | georg.brandl | 2007-03-13 03:06:48 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to pydoc's help keywords. ........ r54331 | georg.brandl | 2007-03-13 03:19:22 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1569798: fix a bug in distutils when building Python from a directory within sys.exec_prefix. ........ r54333 | martin.v.loewis | 2007-03-13 03:24:00 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1449244: Support Unicode strings in email.message.Message.{set_charset,get_content_charset}. Will backport. ........ r54335 | lars.gustaebel | 2007-03-13 03:47:19 -0700 (Tue, 13 Mar 2007) | 34 lines This is the implementation of POSIX.1-2001 (pax) format read/write support. The TarInfo class now contains all necessary logic to process and create tar header data which has been moved there from the TarFile class. The fromtarfile() method was added. The new path and linkpath properties are aliases for the name and linkname attributes in correspondence to the pax naming scheme. The TarFile constructor and classmethods now accept a number of keyword arguments which could only be set as attributes before (e.g. dereference, ignore_zeros). The encoding and pax_headers arguments were added for pax support. There is a new tarinfo keyword argument that allows using subclassed TarInfo objects in TarFile. The boolean TarFile.posix attribute is deprecated, because now three tar formats are supported. Instead, the desired format for writing is specified using the constants USTAR_FORMAT, GNU_FORMAT and PAX_FORMAT as the format keyword argument. This change affects TarInfo.tobuf() as well. The test suite has been heavily reorganized and partially rewritten. A new testtar.tar was added that contains sample data in many formats from 4 different tar programs. Some bugs and quirks that also have been fixed: Directory names do no longer have a trailing slash in TarInfo.name or TarFile.getnames(). Adding the same file twice does not create a hardlink file member. The TarFile constructor does no longer need a name argument. The TarFile._mode attribute was renamed to mode and contains either 'r', 'w' or 'a'. ........ r54336 | georg.brandl | 2007-03-13 05:34:25 -0700 (Tue, 13 Mar 2007) | 3 lines Bug #1622896: fix a rare corner case where the bz2 module raised an error in spite of a succesful compression. ........ r54338 | lars.gustaebel | 2007-03-13 08:47:07 -0700 (Tue, 13 Mar 2007) | 3 lines Quick fix for tests that fail on systems with an encoding other than 'iso8859-1'. ........ r54339 | georg.brandl | 2007-03-13 10:43:32 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1603688: ConfigParser.SafeConfigParser now checks values that are set for invalid interpolation sequences that would lead to errors on reading back those values. ........ r54341 | georg.brandl | 2007-03-13 11:15:41 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1581073: add a flag to textwrap that prevents the dropping of whitespace while wrapping. ........ r54343 | georg.brandl | 2007-03-13 11:24:40 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1605192: list allowed states in error messages for imaplib. ........ r54344 | georg.brandl | 2007-03-13 11:31:49 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1537850: tempfile.NamedTemporaryFile now has a "delete" parameter which can be set to False to prevent the default delete-on-close behavior. ........ r54345 | collin.winter | 2007-03-13 11:53:04 -0700 (Tue, 13 Mar 2007) | 9 lines Add acks for recent patch checkins: Arvin Schnell - 1668482 S?\195?\169bastien Martini - 1481079 Heiko Wundram - 1491866 Damon Kohler - 1545011 Peter Parente - 1599845 Bjorn Lindqvist - 1678662 ........ r54346 | georg.brandl | 2007-03-13 12:00:36 -0700 (Tue, 13 Mar 2007) | 2 lines Acks for recent patches. ........ r54347 | georg.brandl | 2007-03-13 12:18:18 -0700 (Tue, 13 Mar 2007) | 3 lines Fix a tab. ........ r54348 | georg.brandl | 2007-03-13 12:32:21 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1533909: the timeit module now accepts callables in addition to strings for the code to time and the setup code. Also added two convenience functions for instantiating a Timer and calling its methods. ........ r54352 | georg.brandl | 2007-03-13 13:02:57 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1530482: add pydoc.render_doc() which returns the documentation for a thing instead of paging it to stdout, which pydoc.doc() does. ........ r54357 | thomas.heller | 2007-03-13 13:42:52 -0700 (Tue, 13 Mar 2007) | 1 line Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. ........ r54358 | georg.brandl | 2007-03-13 13:46:32 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1444529: the builtin compile() now accepts keyword arguments. (backport) ........ r54359 | thomas.heller | 2007-03-13 14:01:39 -0700 (Tue, 13 Mar 2007) | 1 line Add versionadded marker for ctypes.c_bool. ........ r54360 | georg.brandl | 2007-03-13 14:08:15 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1393667: pdb now has a "run" command which restarts the debugged Python program, optionally with different arguments. ........ r54361 | georg.brandl | 2007-03-13 14:32:01 -0700 (Tue, 13 Mar 2007) | 3 lines Deprecate commands.getstatus(). ........ r54362 | georg.brandl | 2007-03-13 14:32:56 -0700 (Tue, 13 Mar 2007) | 2 lines NEWS entry for getstatus() deprecation. ........ r54363 | georg.brandl | 2007-03-13 14:58:44 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1429539: pdb now correctly initializes the __main__ module for the debugged script, which means that imports from __main__ work correctly now. ........ r54364 | georg.brandl | 2007-03-13 15:07:36 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #957650: "%var%" environment variable references are now properly expanded in ntpath.expandvars(), also "~user" home directory references are recognized and handled on Windows. ........ r54365 | georg.brandl | 2007-03-13 15:16:30 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1194449: correctly detect unbound methods in pydoc. ........ r54367 | georg.brandl | 2007-03-13 15:49:43 -0700 (Tue, 13 Mar 2007) | 5 lines Patch #1185447: binascii.b2a_qp() now correctly quotes binary characters with ASCII value less than 32. Also, it correctly quotes dots only if they occur on a single line, as opposed to the previous behavior of quoting dots if they are the second character of any line. ........ r54368 | collin.winter | 2007-03-13 16:02:15 -0700 (Tue, 13 Mar 2007) | 1 line Inline PyImport_GetModulesReloading(). ........ r54371 | barry.warsaw | 2007-03-13 21:59:50 -0700 (Tue, 13 Mar 2007) | 6 lines SF bug #1582282; decode_header() incorrectly splits not-conformant RFC 2047-like headers where there is no whitespace between encoded words. This fix changes the matching regexp to include a trailing lookahead assertion that the closing ?= must be followed by whitespace, newline, or end-of-string. This also changes the regexp to add the MULTILINE flag. ........ r54372 | gregory.p.smith | 2007-03-14 00:17:40 -0700 (Wed, 14 Mar 2007) | 2 lines correct order and names of the less often used keyword parameters. ........ r54373 | gregory.p.smith | 2007-03-14 00:19:50 -0700 (Wed, 14 Mar 2007) | 5 lines Its time to stop listing (Unix, Windows) when we really mean "everything but Mac OS 9" now that nobody is likely to use Python on Mac OS 9 and most of the (Mac) platform items are all OS X special API specific since OS X is unixy enough for these modules to be available out of the box. ........ r54376 | georg.brandl | 2007-03-14 01:27:52 -0700 (Wed, 14 Mar 2007) | 4 lines Bug #767111: fix long-standing bug in urllib which caused an AttributeError instead of an IOError when the server's response didn't contain a valid HTTP status line. ........ r54378 | ziga.seilnacht | 2007-03-14 05:24:09 -0700 (Wed, 14 Mar 2007) | 4 lines Patch #1680015: Don't modify __slots__ tuple if it contains an unicode name. Remove a reference leak that happened if the name could not be converted to string. Will backport. ........ r54386 | martin.v.loewis | 2007-03-14 13:02:31 -0700 (Wed, 14 Mar 2007) | 3 lines Patch #1559413: Fix test_cmd_line if sys.executable contains a space. Will backport. ........ r54389 | brett.cannon | 2007-03-14 14:40:13 -0700 (Wed, 14 Mar 2007) | 3 lines Note how test_socket_ssl has various exceptions that deal with a flaky Net connection are silenced. ........ r54390 | brett.cannon | 2007-03-14 14:44:15 -0700 (Wed, 14 Mar 2007) | 2 lines Raise ResourceDenied in test_urllib2net when the Net connection goes bad. ........ r54391 | neal.norwitz | 2007-03-14 21:41:20 -0700 (Wed, 14 Mar 2007) | 1 line Wrap a long line and fix a typo (is -> if) ........ r54392 | georg.brandl | 2007-03-15 00:38:14 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1680978: consistently use "alive" instead of "active" in the thread lib doc. ........ r54394 | georg.brandl | 2007-03-15 00:41:30 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1681153: the wave module now closes a file object it opened if initialization failed. ........ r54397 | ziga.seilnacht | 2007-03-15 04:44:55 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1462488: prevent a segfault in object_reduce_ex() by splitting the implementation for __reduce__ and __reduce_ex__ into two separate functions. Fixes bug #931877. Will backport. ........ r54404 | collin.winter | 2007-03-15 21:11:30 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements. Will backport. ........ r54406 | georg.brandl | 2007-03-16 00:55:09 -0700 (Fri, 16 Mar 2007) | 5 lines Bug #1681228: the webbrowser module now correctly uses the default GNOME or KDE browser, depending on whether there is a session of one of those present. Also, it tries the Windows default browser before trying Mozilla variants. (backport) ........ r54407 | georg.brandl | 2007-03-16 01:22:40 -0700 (Fri, 16 Mar 2007) | 4 lines Patch #1273829: os.walk() now has a "followlinks" parameter. If set to True (which is not the default), it visits symlinks pointing to directories. ........ r54408 | georg.brandl | 2007-03-16 01:24:21 -0700 (Fri, 16 Mar 2007) | 2 lines Add \versionadded tag. ........ r54409 | georg.brandl | 2007-03-16 01:33:47 -0700 (Fri, 16 Mar 2007) | 2 lines RFE #1670167: fix in isinstance() docs. ........ r54412 | ziga.seilnacht | 2007-03-16 04:59:38 -0700 (Fri, 16 Mar 2007) | 3 lines Patch #1623563: allow __class__ assignment for classes with __slots__. The old and the new class are still required to have the same slot names, but the order in which they are specified is not relevant. ........ r54413 | ziga.seilnacht | 2007-03-16 05:11:11 -0700 (Fri, 16 Mar 2007) | 2 lines Whitespace cleanup. Also remove the empty lines from the previous check in. ........ r54414 | jeremy.hylton | 2007-03-16 07:49:11 -0700 (Fri, 16 Mar 2007) | 2 lines Remove warning: funcion declaration isn't a prototype ........ r54415 | jeremy.hylton | 2007-03-16 08:59:47 -0700 (Fri, 16 Mar 2007) | 11 lines Clean up formatting of this file. The file should now follow PEP 7, except that it uses 4 space indents (in the style of Py3k). This particular code would be really hard to read with the regular tab idents. Other changes: - reflow long lines - change multi-line conditionals to have test at end of line ........ r54417 | collin.winter | 2007-03-16 14:13:35 -0700 (Fri, 16 Mar 2007) | 1 line Patch #1676994: Refactor test_popen2 to use unittest. ........ r54418 | collin.winter | 2007-03-16 14:15:35 -0700 (Fri, 16 Mar 2007) | 1 line Remove test/output/test_popen2 (missed in r54417). ........ r54419 | collin.winter | 2007-03-16 15:16:08 -0700 (Fri, 16 Mar 2007) | 1 line Patch 1339796: add a relpath() function to os.path. ........ r54421 | georg.brandl | 2007-03-17 09:08:45 -0700 (Sat, 17 Mar 2007) | 5 lines Patch #1675423: PyComplex_AsCComplex() now tries to convert an object to complex using its __complex__() method before falling back to the __float__() method. Therefore, the functions in the cmath module now can operate on objects that define a __complex__() method. (backport) ........ r54423 | gregory.p.smith | 2007-03-17 15:33:35 -0700 (Sat, 17 Mar 2007) | 2 lines move note to the correct section ........ r54426 | georg.brandl | 2007-03-18 01:25:00 -0700 (Sun, 18 Mar 2007) | 2 lines Patch #1682878: the new socket methods are recv_into and recvfrom_into, not *_buf. ........ r54432 | georg.brandl | 2007-03-18 11:28:25 -0700 (Sun, 18 Mar 2007) | 2 lines Patch #1678339: test case for bug in difflib. ........ r54439 | collin.winter | 2007-03-19 11:52:08 -0700 (Mon, 19 Mar 2007) | 1 line Patch #1630118: add a SpooledTemporaryFile class to tempfile. ........ r54441 | georg.brandl | 2007-03-19 12:02:48 -0700 (Mon, 19 Mar 2007) | 2 lines Patch #1683328: fixes and enhancements for "unparse" demo. ........ r54456 | neal.norwitz | 2007-03-19 22:07:28 -0700 (Mon, 19 Mar 2007) | 1 line Add some doc that was left out from some change to platform.py ........ r54457 | neal.norwitz | 2007-03-19 22:08:23 -0700 (Mon, 19 Mar 2007) | 1 line Add a comment about 3k migration ........ r54458 | neal.norwitz | 2007-03-19 22:21:21 -0700 (Mon, 19 Mar 2007) | 1 line Get rid of deprecation warning when testing commands.getstatus() ........ r54459 | neal.norwitz | 2007-03-19 22:23:09 -0700 (Mon, 19 Mar 2007) | 4 lines Try backing out 54407 to see if it corrects the problems on the Windows buildbots. This rev was backported, so we will need to keep both branches in sync, pending the outcome of the test after this checkin. ........ r54460 | neal.norwitz | 2007-03-19 23:13:25 -0700 (Mon, 19 Mar 2007) | 1 line Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-) ........ r54461 | neal.norwitz | 2007-03-19 23:16:26 -0700 (Mon, 19 Mar 2007) | 1 line Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-) ........ r54462 | neal.norwitz | 2007-03-19 23:53:17 -0700 (Mon, 19 Mar 2007) | 5 lines Try to be a little more resilient to errors. This might help the test pass, but my guess is that it won't. I'm guessing that some other test is leaving this file open which means it can't be removed under Windows AFAIK. ........ r54463 | neal.norwitz | 2007-03-20 01:14:57 -0700 (Tue, 20 Mar 2007) | 8 lines Try to get test_urllib to pass on Windows by closing the file. I'm guessing that's the problem. h.getfile() must be called *after* h.getreply() and the fp can be None. I'm not entirely convinced this is the best fix (or even correct). The buildbots will tell us if things improve or not. I don't know if this needs to be backported (assuming it actually works). ........ r54465 | raymond.hettinger | 2007-03-20 14:27:24 -0700 (Tue, 20 Mar 2007) | 1 line Extend work on rev 52962 and 53829 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. ........ r54468 | georg.brandl | 2007-03-20 16:05:14 -0700 (Tue, 20 Mar 2007) | 2 lines Fix for glob.py if filesystem encoding is None. ........ r54479 | neal.norwitz | 2007-03-20 23:39:48 -0700 (Tue, 20 Mar 2007) | 1 line Remove unused file spotted by Paul Hankin ........ r54480 | georg.brandl | 2007-03-21 02:00:39 -0700 (Wed, 21 Mar 2007) | 3 lines Patch #1682205: a TypeError while unpacking an iterable is no longer masked by a generic one with the message "unpack non-sequence". ........ r54482 | georg.brandl | 2007-03-21 02:10:29 -0700 (Wed, 21 Mar 2007) | 2 lines New test for rev. 54407 which only uses directories under TESTFN. ........ r54483 | georg.brandl | 2007-03-21 02:16:53 -0700 (Wed, 21 Mar 2007) | 2 lines Patch #1684834: document some utility C API functions. ........ r54485 | georg.brandl | 2007-03-21 04:51:25 -0700 (Wed, 21 Mar 2007) | 2 lines Fix #1684254: split BROWSER contents with shlex to avoid displaying 'URL'. ........ r54487 | andrew.kuchling | 2007-03-21 07:32:43 -0700 (Wed, 21 Mar 2007) | 1 line Add comments on maintenance of this file ........ r54489 | andrew.kuchling | 2007-03-21 09:57:32 -0700 (Wed, 21 Mar 2007) | 1 line Fix sentence, and fix typo in example ........ r54490 | andrew.kuchling | 2007-03-21 09:59:20 -0700 (Wed, 21 Mar 2007) | 1 line Put code examples at left margin instead of indenting them ........ r54491 | facundo.batista | 2007-03-21 12:41:24 -0700 (Wed, 21 Mar 2007) | 1 line Minor clarification, saying that blocking means no timeout (from bug #882297) ........ r54492 | ziga.seilnacht | 2007-03-21 13:07:56 -0700 (Wed, 21 Mar 2007) | 2 lines Bug #1675967: re patterns pickled with older Python versions can now be unpickled. Will backport. ........ r54495 | raymond.hettinger | 2007-03-21 13:33:57 -0700 (Wed, 21 Mar 2007) | 1 line Add test and fix for fromkeys() optional argument. ........ r54524 | georg.brandl | 2007-03-22 01:05:45 -0700 (Thu, 22 Mar 2007) | 2 lines Bug #1685704: use -m switch in timeit docs. ........ r54533 | thomas.heller | 2007-03-22 12:44:31 -0700 (Thu, 22 Mar 2007) | 5 lines Back out "Patch #1643874: memory leak in ctypes fixed." The code in this patch leaves no way to give up the ownership of a BSTR instance. ........ r54538 | thomas.heller | 2007-03-22 13:34:37 -0700 (Thu, 22 Mar 2007) | 2 lines Explain the purpose of the b_needsfree flag (forward ported from release25-maint). ........ r54539 | guido.van.rossum | 2007-03-22 21:58:42 -0700 (Thu, 22 Mar 2007) | 12 lines - Bug #1683368: The object.__init__() and object.__new__() methods are now stricter in rejecting excess arguments. The only time when either allows excess arguments is when it is not overridden and the other one is. For backwards compatibility, when both are overridden, it is a deprecation warning (for now; maybe a Py3k warning later). When merging this into 3.0, the warnings should become errors. Note: without the change to string.py, lots of spurious warnings happen. What's going on there? ........ r54540 | neal.norwitz | 2007-03-22 22:17:23 -0700 (Thu, 22 Mar 2007) | 1 line Add Mark Dickinson for SF # 1675423. ........ r54541 | martin.v.loewis | 2007-03-23 03:35:49 -0700 (Fri, 23 Mar 2007) | 3 lines Patch #1686451: Fix return type for PySequence_{Count,Index,Fast_GET_SIZE}. Will backport. ........ r54543 | martin.v.loewis | 2007-03-23 06:27:15 -0700 (Fri, 23 Mar 2007) | 3 lines Bug #978833: Revert r50844, as it broke _socketobject.dup. Will backport. ........ r54545 | guido.van.rossum | 2007-03-23 11:53:03 -0700 (Fri, 23 Mar 2007) | 8 lines Add a type.__init__() method that enforces the same signature as type.__new__(), and then calls object.__init__(cls), just to be anal. This allows us to restore the code in string.py's _TemplateMetaclass that called super(...).__init__(name, bases, dct), which I commented out yesterday since it broke due to the stricter argument checking added to object.__init__(). ........ r54546 | facundo.batista | 2007-03-23 11:54:07 -0700 (Fri, 23 Mar 2007) | 4 lines Added a 'create_connect()' function to socket.py, which creates a connection with an optional timeout, and modified httplib.py to use this function in HTTPConnection. Applies patch 1676823. ........ r54547 | guido.van.rossum | 2007-03-23 12:39:01 -0700 (Fri, 23 Mar 2007) | 2 lines Add note about type.__init__(). ........ r54553 | thomas.heller | 2007-03-23 12:55:27 -0700 (Fri, 23 Mar 2007) | 5 lines Prevent creation (followed by a segfault) of array types when the size overflows the valid Py_ssize_t range. Check return values of PyMem_Malloc. Will backport to release25-maint. ........ r54555 | facundo.batista | 2007-03-23 13:23:08 -0700 (Fri, 23 Mar 2007) | 6 lines Surrounded with try/finally to socket's default timeout setting changes in the tests, so failing one test won't produce strange results in others. Also relaxed the timeout settings in the test (where actually the value didn't mean anything). ........ r54556 | collin.winter | 2007-03-23 15:24:39 -0700 (Fri, 23 Mar 2007) | 1 line Make test_relpath() pass on Windows. ........ r54559 | ziga.seilnacht | 2007-03-24 07:24:26 -0700 (Sat, 24 Mar 2007) | 6 lines Patch #1489771: update syntax rules in Python Reference Manual. Python 2.5 added support for explicit relative import statements and yield expressions, which were missing in the manual. Also fix grammar productions that used the names from the Grammar file, markup that broke the generated grammar.txt, and wrap some lines that broke the pdf output. Will backport. ........ r54565 | georg.brandl | 2007-03-24 15:20:34 -0700 (Sat, 24 Mar 2007) | 2 lines Remove typo accent. ........ r54566 | georg.brandl | 2007-03-24 15:27:56 -0700 (Sat, 24 Mar 2007) | 2 lines Revert accidental change. ........ r54567 | brett.cannon | 2007-03-24 18:32:36 -0700 (Sat, 24 Mar 2007) | 3 lines Change the docs to no longer claim that unittest is preferred over doctest for regression tests. ........ r54568 | facundo.batista | 2007-03-24 18:53:21 -0700 (Sat, 24 Mar 2007) | 4 lines Redone the tests, using the infrastructure already present for threading and socket serving. ........ r54570 | facundo.batista | 2007-03-24 20:20:05 -0700 (Sat, 24 Mar 2007) | 3 lines Closing the HTTP connection after each test, and listening more. ........ r54572 | georg.brandl | 2007-03-25 11:44:35 -0700 (Sun, 25 Mar 2007) | 2 lines Markup fix. ........ r54573 | georg.brandl | 2007-03-25 12:04:55 -0700 (Sun, 25 Mar 2007) | 2 lines Markup fix. ........ r54580 | facundo.batista | 2007-03-26 13:18:31 -0700 (Mon, 26 Mar 2007) | 5 lines Added an optional timeout to FTP class. Also I started a test_ftplib.py file to test the ftp lib (right now I included a basic test, the timeout one, and nothing else). ........ r54581 | georg.brandl | 2007-03-26 13:28:28 -0700 (Mon, 26 Mar 2007) | 2 lines Some nits. ........ r54582 | facundo.batista | 2007-03-26 13:56:09 -0700 (Mon, 26 Mar 2007) | 4 lines Forgot to add the file before the previous commit, here go the ftplib tests. ........ r54585 | facundo.batista | 2007-03-27 11:23:21 -0700 (Tue, 27 Mar 2007) | 5 lines Added an optional timeout to poplib.POP3. Also created a test_poplib.py file with a basic test and the timeout ones. Docs are also updated. ........ r54586 | facundo.batista | 2007-03-27 11:50:29 -0700 (Tue, 27 Mar 2007) | 3 lines The basic test cases of poplib.py. ........ r54594 | facundo.batista | 2007-03-27 20:45:20 -0700 (Tue, 27 Mar 2007) | 4 lines Bug 1688393. Adds a control of negative values in socket.recvfrom, which caused an ugly crash. ........ r54599 | facundo.batista | 2007-03-28 11:25:54 -0700 (Wed, 28 Mar 2007) | 5 lines Added timeout to smtplib (to SMTP and SMTP_SSL). Also created the test_smtplib.py file, with a basic test and the timeout ones. Docs are updated too. ........ r54603 | collin.winter | 2007-03-28 16:34:06 -0700 (Wed, 28 Mar 2007) | 3 lines Consolidate patches #1690164, 1683397, and 1690169, all of which refactor XML-related test suites. The patches are applied together because they use a common output/xmltests file. Thanks to Jerry Seutter for all three patches. ........ r54604 | collin.winter | 2007-03-28 19:28:16 -0700 (Wed, 28 Mar 2007) | 1 line Make test_zipfile clean up its temporary files properly. ........ r54605 | georg.brandl | 2007-03-29 00:41:32 -0700 (Thu, 29 Mar 2007) | 2 lines These are actually methods. ........ r54606 | georg.brandl | 2007-03-29 05:42:07 -0700 (Thu, 29 Mar 2007) | 4 lines In Windows' time.clock(), when QueryPerformanceFrequency() fails, the C lib's clock() is used, but it must be divided by CLOCKS_PER_SEC as for the POSIX implementation (thanks to #pypy). ........ r54608 | facundo.batista | 2007-03-29 11:22:35 -0700 (Thu, 29 Mar 2007) | 5 lines Added timout parameter to telnetlib.Telnet. Also created test_telnetlib.py with a basic test and timeout ones. Docs are also updated. ........ r54613 | facundo.batista | 2007-03-30 06:00:35 -0700 (Fri, 30 Mar 2007) | 4 lines Added the posibility to pass the timeout to FTP.connect, not only when instantiating the class. Docs and tests are updated. ........ r54614 | collin.winter | 2007-03-30 07:01:25 -0700 (Fri, 30 Mar 2007) | 1 line Bug #1688274: add documentation for C-level class objects. ........ r54615 | marc-andre.lemburg | 2007-03-30 08:01:42 -0700 (Fri, 30 Mar 2007) | 4 lines Bump the patch level version of distutils since there were a few bug fixes since the 2.5.0 release. ........ r54617 | georg.brandl | 2007-03-30 08:49:05 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54618 | georg.brandl | 2007-03-30 10:39:39 -0700 (Fri, 30 Mar 2007) | 2 lines Label name fix. ........ r54619 | georg.brandl | 2007-03-30 10:47:21 -0700 (Fri, 30 Mar 2007) | 2 lines Duplicate label fix. ........ r54620 | georg.brandl | 2007-03-30 10:48:39 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54623 | andrew.kuchling | 2007-03-30 11:00:15 -0700 (Fri, 30 Mar 2007) | 1 line Add item. (Oops, accidentally checked this in on my branch) ........ r54624 | georg.brandl | 2007-03-30 12:01:38 -0700 (Fri, 30 Mar 2007) | 2 lines Duplicate label fix. ........ r54625 | georg.brandl | 2007-03-30 12:14:02 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54629 | georg.brandl | 2007-03-31 03:17:31 -0700 (Sat, 31 Mar 2007) | 2 lines repair string literal. ........ r54630 | georg.brandl | 2007-03-31 04:54:58 -0700 (Sat, 31 Mar 2007) | 2 lines Markup fix. ........ r54631 | georg.brandl | 2007-03-31 04:58:36 -0700 (Sat, 31 Mar 2007) | 2 lines Duplicate label fix. ........ r54632 | georg.brandl | 2007-03-31 04:59:54 -0700 (Sat, 31 Mar 2007) | 2 lines Typo fix. ........ r54633 | neal.norwitz | 2007-03-31 11:54:18 -0700 (Sat, 31 Mar 2007) | 1 line Fix method names. Will backport. ........ r54634 | georg.brandl | 2007-03-31 11:56:11 -0700 (Sat, 31 Mar 2007) | 4 lines Bug #1655392: don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS returned by python-config if Python was built with --enable-shared because that prevented the shared library from being used. ........ r54637 | collin.winter | 2007-03-31 12:31:34 -0700 (Sat, 31 Mar 2007) | 1 line Shut up an occaisonal buildbot error due to test files being left around. ........ r54644 | neal.norwitz | 2007-04-01 11:24:22 -0700 (Sun, 01 Apr 2007) | 11 lines SF #1685563, MSVCCompiler creates redundant and long PATH strings If MSVCCompiler.initialize() was called multiple times, the path would get duplicated. On Windows, this is a problem because the path is limited to 4k. There's no benefit in adding a path multiple times, so prevent that from occuring. We also normalize the path before checking for duplicates so things like /a and /a/ won't both be stored. Will backport. ........ r54646 | brett.cannon | 2007-04-01 11:47:27 -0700 (Sun, 01 Apr 2007) | 8 lines time.strptime's caching of its locale object was being recreated when the locale changed but not used during the function call it was recreated during. The test in this checkin is untested (OS X does not have the proper locale support for me to test), although the fix for the bug this deals with was tested by the OP (#1290505). Once the buildbots verify the test at least doesn't fail it becomes a backport candidate. ........ r54647 | brett.cannon | 2007-04-01 12:46:19 -0700 (Sun, 01 Apr 2007) | 3 lines Fix the test for recreating the locale cache object by not worrying about if one of the test locales cannot be set. ........ r54649 | georg.brandl | 2007-04-01 14:29:15 -0700 (Sun, 01 Apr 2007) | 2 lines Fix a lot of markup and meta-information glitches. ........ r54650 | georg.brandl | 2007-04-01 14:39:52 -0700 (Sun, 01 Apr 2007) | 2 lines Another fix. ........ r54651 | georg.brandl | 2007-04-01 15:39:10 -0700 (Sun, 01 Apr 2007) | 2 lines Lots of explicit class names for method and member descs. ........ r54652 | georg.brandl | 2007-04-01 15:40:12 -0700 (Sun, 01 Apr 2007) | 2 lines Explicit class names. ........ r54653 | georg.brandl | 2007-04-01 15:47:31 -0700 (Sun, 01 Apr 2007) | 2 lines Some semantic fixes. ........ r54654 | georg.brandl | 2007-04-01 16:29:10 -0700 (Sun, 01 Apr 2007) | 2 lines Remove bogus entry. ........ r54655 | georg.brandl | 2007-04-01 16:31:30 -0700 (Sun, 01 Apr 2007) | 2 lines Fix the class name of strings. ........ r54658 | raymond.hettinger | 2007-04-02 10:29:30 -0700 (Mon, 02 Apr 2007) | 1 line SF #1693079: Cannot save empty array in shelve ........ r54663 | raymond.hettinger | 2007-04-02 15:54:21 -0700 (Mon, 02 Apr 2007) | 3 lines Array module's buffer interface can now handle empty arrays. ........ r54664 | guido.van.rossum | 2007-04-02 16:55:37 -0700 (Mon, 02 Apr 2007) | 5 lines Fix warnings about object.__init__() signature. Two (test_array and test_descr) were bug IMO; the third (copy_reg) is a work-around which recognizes that object.__init__() doesn't do anything. ........ r54666 | raymond.hettinger | 2007-04-02 17:02:11 -0700 (Mon, 02 Apr 2007) | 1 line SF 1602378 Clarify docstrings for bisect ........ r54668 | raymond.hettinger | 2007-04-02 18:39:43 -0700 (Mon, 02 Apr 2007) | 3 lines SF #1382213: Tutorial section 9.5.1 ignores MRO for new-style classes ........ r54669 | matthias.klose | 2007-04-02 21:35:59 -0700 (Mon, 02 Apr 2007) | 4 lines - Fix an off-by-one bug in locale.strxfrm(). patch taken from http://bugs.debian.org/416934. ........ r54671 | georg.brandl | 2007-04-03 00:04:27 -0700 (Tue, 03 Apr 2007) | 9 lines Fix the strange case of \begin{methoddesc}[NNTP]{...} where \ifx#1\@undefined ended up comparing N and N, therefore executing the true part of the conditional, blowing up at \@undefined. ........ r54672 | facundo.batista | 2007-04-03 07:05:08 -0700 (Tue, 03 Apr 2007) | 4 lines Now using unittest for the tests infraestructure. Also split the tests in those who need the network, and that who doesn't. ........ r54673 | walter.doerwald | 2007-04-03 09:08:10 -0700 (Tue, 03 Apr 2007) | 4 lines Move the functionality for catching warnings in test_warnings.py into a separate class to that reusing the functionality in test_structmembers.py doesn't rerun the tests from test_warnings.py. ........ r54674 | walter.doerwald | 2007-04-03 09:16:24 -0700 (Tue, 03 Apr 2007) | 2 lines Document that CatchWarningTests is reused by test_structmembers.py. ........ r54675 | walter.doerwald | 2007-04-03 09:53:43 -0700 (Tue, 03 Apr 2007) | 4 lines Add tests for the filename. Test that the stacklevel is handled correctly. ........ r54676 | facundo.batista | 2007-04-03 10:29:48 -0700 (Tue, 03 Apr 2007) | 6 lines Added a SSL server to test_socket_ssl.py to be able to test locally. Now, it checks if have openssl available and run those specific tests (it starts openssl at the beggining of all the tests and then kills it at the end). ........ r54677 | walter.doerwald | 2007-04-03 11:33:29 -0700 (Tue, 03 Apr 2007) | 6 lines Implement a contextmanager test.test_support.catch_warning that can be used to catch the last warning issued by the warning framework. Change test_warnings.py and test_structmembers.py to use this new contextmanager. ........ r54678 | facundo.batista | 2007-04-03 14:15:34 -0700 (Tue, 03 Apr 2007) | 4 lines Changed the whole structure of startup and checking if the server is available. Hope to not get more false alarms. ........ r54681 | facundo.batista | 2007-04-04 07:10:40 -0700 (Wed, 04 Apr 2007) | 4 lines Fixed the way that the .pem files are looked for, and changed how to kill the process in win32 to use the _handle attribute. ........ r54682 | guido.van.rossum | 2007-04-04 10:43:02 -0700 (Wed, 04 Apr 2007) | 4 lines Fix a race condition in this test -- instead of assuming that it will take the test server thread at most 0.5 seconds to get ready, use an event variable. ........ r54683 | collin.winter | 2007-04-04 11:14:17 -0700 (Wed, 04 Apr 2007) | 1 line Clean up imports. ........ r54684 | collin.winter | 2007-04-04 11:16:24 -0700 (Wed, 04 Apr 2007) | 1 line Stop using test_support.verify(). ........ r54685 | martin.v.loewis | 2007-04-04 11:30:36 -0700 (Wed, 04 Apr 2007) | 2 lines Bug #1686475: Support stat'ing open files on Windows again. Will backport to 2.5. ........ r54687 | collin.winter | 2007-04-04 11:33:40 -0700 (Wed, 04 Apr 2007) | 1 line Make test_getopt use unittest. ........ r54688 | collin.winter | 2007-04-04 11:36:30 -0700 (Wed, 04 Apr 2007) | 1 line Make test_softspace use unittest. ........ r54689 | ziga.seilnacht | 2007-04-04 11:38:47 -0700 (Wed, 04 Apr 2007) | 2 lines Fix WalkTests.test_traversal() on Windows. The cleanup in MakedirTests.setUp() can now be removed. ........ r54695 | raymond.hettinger | 2007-04-05 11:00:03 -0700 (Thu, 05 Apr 2007) | 3 lines Bug #1563759: struct.unpack doens't support buffer protocol objects ........ r54697 | collin.winter | 2007-04-05 13:05:07 -0700 (Thu, 05 Apr 2007) | 1 line Convert test_long_future to use unittest. ........ r54698 | collin.winter | 2007-04-05 13:08:56 -0700 (Thu, 05 Apr 2007) | 1 line Convert test_normalization to use unittest. ........ r54699 | andrew.kuchling | 2007-04-05 18:11:58 -0700 (Thu, 05 Apr 2007) | 1 line Some grammar fixes ........ r54704 | collin.winter | 2007-04-06 12:27:40 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_stringprep to use unittest. ........ r54705 | collin.winter | 2007-04-06 12:32:32 -0700 (Fri, 06 Apr 2007) | 1 line Import cleanup in test_crypt. ........ r54706 | collin.winter | 2007-04-06 13:00:05 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_gc to use unittest. ........ r54707 | collin.winter | 2007-04-06 13:03:11 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_module to use unittest. ........ r54711 | collin.winter | 2007-04-06 21:40:43 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_fileinput to use unittest. ........ r54712 | brett.cannon | 2007-04-07 21:29:32 -0700 (Sat, 07 Apr 2007) | 5 lines Doc that file.next() has undefined behaviour when called on a file opened with 'w'. Closes bug #1569057. To be backported once 2.5 branch is unfrozen. ........ r54726 | vinay.sajip | 2007-04-09 09:16:10 -0700 (Mon, 09 Apr 2007) | 1 line Added optional timeout to SocketHandler.makeSocket (SF #1695948) ........ r54727 | ziga.seilnacht | 2007-04-09 12:10:29 -0700 (Mon, 09 Apr 2007) | 3 lines Patch #1695862: remove old test directory that causes test_urllib failures on Windows buildbots. The change is a one time fix and will be removed after a successful buildbot run. ........ r54729 | facundo.batista | 2007-04-09 20:00:37 -0700 (Mon, 09 Apr 2007) | 3 lines Minor fix to the tests pass ok even with -O. ........ r54730 | collin.winter | 2007-04-09 21:44:49 -0700 (Mon, 09 Apr 2007) | 1 line Typo fix. ........ r54732 | facundo.batista | 2007-04-10 05:58:45 -0700 (Tue, 10 Apr 2007) | 5 lines General clean-up. Lot of margin corrections, comments, some typos. Exceptions now are raised in the new style. And a mockup class is now also new style. Thanks Santiago Pereson. ........ r54741 | georg.brandl | 2007-04-10 14:39:38 -0700 (Tue, 10 Apr 2007) | 2 lines Repair a duplicate label and some obsolete uses of \setindexsubitem. ........ r54746 | andrew.kuchling | 2007-04-11 06:39:00 -0700 (Wed, 11 Apr 2007) | 1 line Add window.chgat() method, submitted via e-mail by Fabian Kreutz ........ r54747 | andrew.kuchling | 2007-04-11 06:42:25 -0700 (Wed, 11 Apr 2007) | 1 line Point readers at the patch submission instructions ........ r54748 | andrew.kuchling | 2007-04-11 06:47:13 -0700 (Wed, 11 Apr 2007) | 1 line Describe undocumented third argument to touchline() ........ r54757 | georg.brandl | 2007-04-11 10:16:24 -0700 (Wed, 11 Apr 2007) | 3 lines Add some missing NULL checks which trigger crashes on low-memory conditions. Found by Victor Stinner. Will backport when 2.5 branch is unfrozen. ........ r54760 | raymond.hettinger | 2007-04-11 11:40:58 -0700 (Wed, 11 Apr 2007) | 1 line SF 1191699: Make slices picklable ........ r54762 | georg.brandl | 2007-04-11 12:25:11 -0700 (Wed, 11 Apr 2007) | 2 lines Exceptions are no longer old-style instances. Fix accordingly. ........ r54763 | georg.brandl | 2007-04-11 16:28:44 -0700 (Wed, 11 Apr 2007) | 2 lines Repair missing spaces after \UNIX. ........ r54772 | raymond.hettinger | 2007-04-11 21:10:00 -0700 (Wed, 11 Apr 2007) | 1 line SF 1193128: Let str.translate(None) be an identity transformation ........ r54784 | georg.brandl | 2007-04-12 00:01:19 -0700 (Thu, 12 Apr 2007) | 2 lines Patch #1698951: clarify deprecation message in rexec and Bastion ........ r54785 | ziga.seilnacht | 2007-04-12 01:46:51 -0700 (Thu, 12 Apr 2007) | 2 lines Patch #1695862: remove the cleanup code, now that Windows buildbots are green again. ........ r54786 | walter.doerwald | 2007-04-12 03:35:00 -0700 (Thu, 12 Apr 2007) | 3 lines Fix utf-8-sig incremental decoder, which didn't recognise a BOM when the first chunk fed to the decoder started with a BOM, but was longer than 3 bytes. ........ r54807 | barry.warsaw | 2007-04-13 11:47:14 -0700 (Fri, 13 Apr 2007) | 8 lines Port r54805 from python25-maint branch: Add code to read from master_fd in the parent, breaking when we get an OSError (EIO can occur on Linux) or there's no more data to read. Without this, test_pty.py can hang on the waitpid() because the child is blocking on the stdout write. This will definitely happen on Mac OS X and could potentially happen on other platforms. See the comment for details. ........ r54812 | kristjan.jonsson | 2007-04-13 15:07:33 -0700 (Fri, 13 Apr 2007) | 1 line Fix a bug when using the __lltrace__ opcode tracer, and a problem sith signed chars in frameobject.c which can occur with opcodes > 127 ........ r54814 | kristjan.jonsson | 2007-04-13 15:20:13 -0700 (Fri, 13 Apr 2007) | 1 line Fix potential crash in path manipulation on windows ........ r54816 | trent.mick | 2007-04-13 16:22:05 -0700 (Fri, 13 Apr 2007) | 4 lines Add the necessary dependency for the Windows VC6 build to ensure 'pythoncore' is built before '_ctypes' is attempted. Will backport to 2.5 once it is unfrozen for 2.5.1. ........ r54825 | neal.norwitz | 2007-04-13 22:25:50 -0700 (Fri, 13 Apr 2007) | 3 lines When __slots__ are set to a unicode string, make it work the same as setting a plain string, ie don't expand to single letter identifiers. ........ r54841 | neal.norwitz | 2007-04-16 00:37:55 -0700 (Mon, 16 Apr 2007) | 1 line SF #1701207, Fix bogus assertion (and test it!) ........ r54844 | collin.winter | 2007-04-16 15:10:32 -0700 (Mon, 16 Apr 2007) | 1 line Check the availability of the urlfetch resource earlier than before. ........ r54849 | martin.v.loewis | 2007-04-16 22:02:01 -0700 (Mon, 16 Apr 2007) | 2 lines Add Travis Oliphant. ........ r54873 | brett.cannon | 2007-04-18 20:44:17 -0700 (Wed, 18 Apr 2007) | 2 lines Silence a compiler warning about incompatible pointer types. ........ r54874 | neal.norwitz | 2007-04-18 22:52:37 -0700 (Wed, 18 Apr 2007) | 2 lines SF #1703270, add missing declaration in readline.c to avoid compiler warning. ........ r54875 | armin.rigo | 2007-04-19 07:44:48 -0700 (Thu, 19 Apr 2007) | 8 lines Revert r53997 as per http://mail.python.org/pipermail/python-dev/2007-March/071796.html . I've kept a couple of still-valid extra tests in test_descr, but didn't bother to sort through the new comments and refactorings added in r53997 to see if some of them could be kept. If so, they could go in a follow-up check-in. ........ r54876 | armin.rigo | 2007-04-19 07:56:48 -0700 (Thu, 19 Apr 2007) | 2 lines Fix a usage of the dangerous pattern decref - modify field - incref. ........ r54884 | neal.norwitz | 2007-04-19 22:20:38 -0700 (Thu, 19 Apr 2007) | 9 lines Add an optional address to copy the failure mails to. Detect a conflict in the only file that should have outstanding changes when this script is run. This doesn't matter on the trunk, but does when run on a branch. Trunk always has the date set to today in boilerplate.tex. Each time a release is cut with a different date, a conflict occurs. (We could copy a known good version, but then we would lose changes to this file.) ........ r54918 | georg.brandl | 2007-04-21 13:35:38 -0700 (Sat, 21 Apr 2007) | 3 lines Bug #1704790: bind name "sys" locally in __del__ method so that it is not cleared before __del__ is run. ........ r54920 | facundo.batista | 2007-04-21 18:18:56 -0700 (Sat, 21 Apr 2007) | 5 lines Added tests for other methods of SSL object. Now we cover all the object methods. This is the final step to close the #451607 bug. ........ r54927 | facundo.batista | 2007-04-23 10:08:31 -0700 (Mon, 23 Apr 2007) | 5 lines As specified in RFC 2616, 2xx code indicates that the client's request was successfully received, understood, and accepted. Now in these cases no error is raised. Also fixed tests. ........ r54929 | collin.winter | 2007-04-23 20:43:46 -0700 (Mon, 23 Apr 2007) | 1 line Convert PyUnit -> unittest. ........ r54931 | collin.winter | 2007-04-23 21:09:52 -0700 (Mon, 23 Apr 2007) | 1 line Remove code that hasn't been called in years. ........ r54932 | neal.norwitz | 2007-04-23 21:53:12 -0700 (Mon, 23 Apr 2007) | 1 line Fix SF #1703110, Incorrect example for add_password() (use uri, not host) ........ r54934 | georg.brandl | 2007-04-24 03:36:42 -0700 (Tue, 24 Apr 2007) | 2 lines Some new year updates. ........ r54938 | facundo.batista | 2007-04-24 06:54:38 -0700 (Tue, 24 Apr 2007) | 4 lines Added a comment about last change in urllib2.py (all 2xx responses are ok now). ........ r54939 | georg.brandl | 2007-04-24 08:10:09 -0700 (Tue, 24 Apr 2007) | 2 lines Bug #1705717: error in sys.argv docs. ........ r54941 | georg.brandl | 2007-04-24 08:27:13 -0700 (Tue, 24 Apr 2007) | 4 lines Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file (as opposed to the command line) will now write file names ending in ".cpp" too. ........ r54944 | raymond.hettinger | 2007-04-24 15:13:43 -0700 (Tue, 24 Apr 2007) | 1 line Fix markup ........ r54945 | kristjan.jonsson | 2007-04-24 17:10:50 -0700 (Tue, 24 Apr 2007) | 1 line Merge change 54909 from release25-maint: Fix several minor issues discovered using code analysis in VisualStudio 2005 Team Edition ........ r54947 | kristjan.jonsson | 2007-04-24 17:17:39 -0700 (Tue, 24 Apr 2007) | 1 line Make pythoncore compile cleanly with VisualStudio 2005. Used an explicit typecast to get a 64 bit integer, and undefined the Yield macro that conflicts with winbase.h ........ r54948 | kristjan.jonsson | 2007-04-24 17:19:26 -0700 (Tue, 24 Apr 2007) | 1 line Remove obsolete comment. Importing of .dll files has been discontinued, only .pyd files supported on windows now. ........ r54949 | georg.brandl | 2007-04-24 23:24:59 -0700 (Tue, 24 Apr 2007) | 2 lines Patch #1698768: updated the "using Python on the Mac" intro. ........ r54951 | georg.brandl | 2007-04-24 23:25:55 -0700 (Tue, 24 Apr 2007) | 2 lines Markup fix. ........ r54953 | neal.norwitz | 2007-04-24 23:30:05 -0700 (Tue, 24 Apr 2007) | 3 lines Whitespace normalization. Ugh, we really need to do this more often. You might want to review this change as it's my first time. Be gentle. :-) ........ r54956 | collin.winter | 2007-04-25 10:29:52 -0700 (Wed, 25 Apr 2007) | 1 line Standardize on test.test_support.run_unittest() (as opposed to a mix of run_unittest() and run_suite()). Also, add functionality to run_unittest() that admits usage of unittest.TestLoader.loadTestsFromModule(). ........ r54957 | collin.winter | 2007-04-25 10:37:35 -0700 (Wed, 25 Apr 2007) | 1 line Remove functionality from test_datetime.test_main() that does reference count checking; 'regrtest.py -R' is the way to do this kind of testing. ........ r54958 | collin.winter | 2007-04-25 10:57:53 -0700 (Wed, 25 Apr 2007) | 1 line Change test_support.have_unicode to use True/False instead of 1/0. ........ r54959 | tim.peters | 2007-04-25 11:47:18 -0700 (Wed, 25 Apr 2007) | 2 lines Whitespace normalization. ........ r54960 | tim.peters | 2007-04-25 11:48:35 -0700 (Wed, 25 Apr 2007) | 2 lines Set missing svn:eol-style property on text files. ........ r54961 | collin.winter | 2007-04-25 11:54:36 -0700 (Wed, 25 Apr 2007) | 1 line Import and raise statement cleanup. ........ r54969 | collin.winter | 2007-04-25 13:41:34 -0700 (Wed, 25 Apr 2007) | 1 line Convert test_ossaudiodev to use unittest. ........ r54974 | collin.winter | 2007-04-25 14:50:25 -0700 (Wed, 25 Apr 2007) | 1 line Fix an issue related to the unittest conversion. ........ r54979 | fred.drake | 2007-04-25 21:42:19 -0700 (Wed, 25 Apr 2007) | 1 line fix some markup errors ........ r54982 | kristjan.jonsson | 2007-04-26 02:15:08 -0700 (Thu, 26 Apr 2007) | 1 line Export function sanitize_the_mode from fileobject.c as _PyFile_SanitizeMode(). Use this function in posixmodule.c when implementing fdopen(). This fixes test_subprocess.py for a VisualStudio 2005 compile. ........ r54983 | kristjan.jonsson | 2007-04-26 06:44:16 -0700 (Thu, 26 Apr 2007) | 1 line The locale "En" appears not to be valid on windows underi VisualStudio.2005. Added "English" to the test_locale.py to make the testsuite pass for that build ........ r54984 | steve.holden | 2007-04-26 07:23:12 -0700 (Thu, 26 Apr 2007) | 1 line Minor wording change on slicing aide-memoire. ........ r54985 | kristjan.jonsson | 2007-04-26 08:24:54 -0700 (Thu, 26 Apr 2007) | 1 line Accomodate 64 bit time_t in the _bsddb module. ........
1888 lines
72 KiB
TeX
1888 lines
72 KiB
TeX
% THIS FILE IS AUTO-GENERATED! DO NOT EDIT!
|
|
% (Your changes will be lost the next time it is generated.)
|
|
\section{\module{optparse} --- More powerful command line option parser}
|
|
\declaremodule{standard}{optparse}
|
|
\moduleauthor{Greg Ward}{gward@python.net}
|
|
\modulesynopsis{More convenient, flexible, and powerful command-line parsing library.}
|
|
\versionadded{2.3}
|
|
\sectionauthor{Greg Ward}{gward@python.net}
|
|
% An intro blurb used only when generating LaTeX docs for the Python
|
|
% manual (based on README.txt).
|
|
|
|
\code{optparse} is a more convenient, flexible, and powerful library for
|
|
parsing command-line options than \code{getopt}. \code{optparse} uses a more
|
|
declarative style of command-line parsing: you create an instance of
|
|
\class{OptionParser}, populate it with options, and parse the command line.
|
|
\code{optparse} allows users to specify options in the conventional GNU/POSIX
|
|
syntax, and additionally generates usage and help messages for you.
|
|
|
|
Here's an example of using \code{optparse} in a simple script:
|
|
\begin{verbatim}
|
|
from optparse import OptionParser
|
|
[...]
|
|
parser = OptionParser()
|
|
parser.add_option("-f", "--file", dest="filename",
|
|
help="write report to FILE", metavar="FILE")
|
|
parser.add_option("-q", "--quiet",
|
|
action="store_false", dest="verbose", default=True,
|
|
help="don't print status messages to stdout")
|
|
|
|
(options, args) = parser.parse_args()
|
|
\end{verbatim}
|
|
|
|
With these few lines of code, users of your script can now do the
|
|
``usual thing'' on the command-line, for example:
|
|
\begin{verbatim}
|
|
<yourscript> --file=outfile -q
|
|
\end{verbatim}
|
|
|
|
As it parses the command line, \code{optparse} sets attributes of the
|
|
\code{options} object returned by \method{parse{\_}args()} based on user-supplied
|
|
command-line values. When \method{parse{\_}args()} returns from parsing this
|
|
command line, \code{options.filename} will be \code{"outfile"} and
|
|
\code{options.verbose} will be \code{False}. \code{optparse} supports both long
|
|
and short options, allows short options to be merged together, and
|
|
allows options to be associated with their arguments in a variety of
|
|
ways. Thus, the following command lines are all equivalent to the above
|
|
example:
|
|
\begin{verbatim}
|
|
<yourscript> -f outfile --quiet
|
|
<yourscript> --quiet --file outfile
|
|
<yourscript> -q -foutfile
|
|
<yourscript> -qfoutfile
|
|
\end{verbatim}
|
|
|
|
Additionally, users can run one of
|
|
\begin{verbatim}
|
|
<yourscript> -h
|
|
<yourscript> --help
|
|
\end{verbatim}
|
|
|
|
and \code{optparse} will print out a brief summary of your script's
|
|
options:
|
|
\begin{verbatim}
|
|
usage: <yourscript> [options]
|
|
|
|
options:
|
|
-h, --help show this help message and exit
|
|
-f FILE, --file=FILE write report to FILE
|
|
-q, --quiet don't print status messages to stdout
|
|
\end{verbatim}
|
|
|
|
where the value of \emph{yourscript} is determined at runtime (normally
|
|
from \code{sys.argv{[}0]}).
|
|
% $Id: intro.txt 413 2004-09-28 00:59:13Z greg $
|
|
|
|
|
|
\subsection{Background\label{optparse-background}}
|
|
|
|
\module{optparse} was explicitly designed to encourage the creation of programs with
|
|
straightforward, conventional command-line interfaces. To that end, it
|
|
supports only the most common command-line syntax and semantics
|
|
conventionally used under \UNIX{}. If you are unfamiliar with these
|
|
conventions, read this section to acquaint yourself with them.
|
|
|
|
|
|
\subsubsection{Terminology\label{optparse-terminology}}
|
|
\begin{description}
|
|
\item[argument]
|
|
a string entered on the command-line, and passed by the shell to
|
|
\code{execl()} or \code{execv()}. In Python, arguments are elements of
|
|
\code{sys.argv{[}1:]} (\code{sys.argv{[}0]} is the name of the program being
|
|
executed). \UNIX{} shells also use the term ``word''.
|
|
|
|
It is occasionally desirable to substitute an argument list other
|
|
than \code{sys.argv{[}1:]}, so you should read ``argument'' as ``an element of
|
|
\code{sys.argv{[}1:]}, or of some other list provided as a substitute for
|
|
\code{sys.argv{[}1:]}''.
|
|
\item[option ]
|
|
an argument used to supply extra information to guide or customize the
|
|
execution of a program. There are many different syntaxes for
|
|
options; the traditional \UNIX{} syntax is a hyphen (``-'') followed by a
|
|
single letter, e.g. \code{"-x"} or \code{"-F"}. Also, traditional \UNIX{}
|
|
syntax allows multiple options to be merged into a single argument,
|
|
e.g. \code{"-x -F"} is equivalent to \code{"-xF"}. The GNU project
|
|
introduced \code{"-{}-"} followed by a series of hyphen-separated words,
|
|
e.g. \code{"-{}-file"} or \code{"-{}-dry-run"}. These are the only two option
|
|
syntaxes provided by \module{optparse}.
|
|
|
|
Some other option syntaxes that the world has seen include:
|
|
\begin{itemize}
|
|
\item {}
|
|
a hyphen followed by a few letters, e.g. \code{"-pf"} (this is
|
|
\emph{not} the same as multiple options merged into a single argument)
|
|
|
|
\item {}
|
|
a hyphen followed by a whole word, e.g. \code{"-file"} (this is
|
|
technically equivalent to the previous syntax, but they aren't
|
|
usually seen in the same program)
|
|
|
|
\item {}
|
|
a plus sign followed by a single letter, or a few letters,
|
|
or a word, e.g. \code{"+f"}, \code{"+rgb"}
|
|
|
|
\item {}
|
|
a slash followed by a letter, or a few letters, or a word, e.g.
|
|
\code{"/f"}, \code{"/file"}
|
|
|
|
\end{itemize}
|
|
|
|
These option syntaxes are not supported by \module{optparse}, and they never will
|
|
be. This is deliberate: the first three are non-standard on any
|
|
environment, and the last only makes sense if you're exclusively
|
|
targeting VMS, MS-DOS, and/or Windows.
|
|
\item[option argument]
|
|
an argument that follows an option, is closely associated with that
|
|
option, and is consumed from the argument list when that option is.
|
|
With \module{optparse}, option arguments may either be in a separate argument
|
|
from their option:
|
|
\begin{verbatim}
|
|
-f foo
|
|
--file foo
|
|
\end{verbatim}
|
|
|
|
or included in the same argument:
|
|
\begin{verbatim}
|
|
-ffoo
|
|
--file=foo
|
|
\end{verbatim}
|
|
|
|
Typically, a given option either takes an argument or it doesn't.
|
|
Lots of people want an ``optional option arguments'' feature, meaning
|
|
that some options will take an argument if they see it, and won't if
|
|
they don't. This is somewhat controversial, because it makes parsing
|
|
ambiguous: if \code{"-a"} takes an optional argument and \code{"-b"} is
|
|
another option entirely, how do we interpret \code{"-ab"}? Because of
|
|
this ambiguity, \module{optparse} does not support this feature.
|
|
\item[positional argument]
|
|
something leftover in the argument list after options have been
|
|
parsed, i.e. after options and their arguments have been parsed and
|
|
removed from the argument list.
|
|
\item[required option]
|
|
an option that must be supplied on the command-line; note that the
|
|
phrase ``required option'' is self-contradictory in English. \module{optparse}
|
|
doesn't prevent you from implementing required options, but doesn't
|
|
give you much help at it either. See \code{examples/required{\_}1.py} and
|
|
\code{examples/required{\_}2.py} in the \module{optparse} source distribution for two
|
|
ways to implement required options with \module{optparse}.
|
|
\end{description}
|
|
|
|
For example, consider this hypothetical command-line:
|
|
\begin{verbatim}
|
|
prog -v --report /tmp/report.txt foo bar
|
|
\end{verbatim}
|
|
|
|
\code{"-v"} and \code{"-{}-report"} are both options. Assuming that
|
|
\longprogramopt{report} takes one argument, \code{"/tmp/report.txt"} is an option
|
|
argument. \code{"foo"} and \code{"bar"} are positional arguments.
|
|
|
|
|
|
\subsubsection{What are options for?\label{optparse-what-options-for}}
|
|
|
|
Options are used to provide extra information to tune or customize the
|
|
execution of a program. In case it wasn't clear, options are usually
|
|
\emph{optional}. A program should be able to run just fine with no options
|
|
whatsoever. (Pick a random program from the \UNIX{} or GNU toolsets. Can
|
|
it run without any options at all and still make sense? The main
|
|
exceptions are \code{find}, \code{tar}, and \code{dd}{---}all of which are mutant
|
|
oddballs that have been rightly criticized for their non-standard syntax
|
|
and confusing interfaces.)
|
|
|
|
Lots of people want their programs to have ``required options''. Think
|
|
about it. If it's required, then it's \emph{not optional}! If there is a
|
|
piece of information that your program absolutely requires in order to
|
|
run successfully, that's what positional arguments are for.
|
|
|
|
As an example of good command-line interface design, consider the humble
|
|
\code{cp} utility, for copying files. It doesn't make much sense to try to
|
|
copy files without supplying a destination and at least one source.
|
|
Hence, \code{cp} fails if you run it with no arguments. However, it has a
|
|
flexible, useful syntax that does not require any options at all:
|
|
\begin{verbatim}
|
|
cp SOURCE DEST
|
|
cp SOURCE ... DEST-DIR
|
|
\end{verbatim}
|
|
|
|
You can get pretty far with just that. Most \code{cp} implementations
|
|
provide a bunch of options to tweak exactly how the files are copied:
|
|
you can preserve mode and modification time, avoid following symlinks,
|
|
ask before clobbering existing files, etc. But none of this distracts
|
|
from the core mission of \code{cp}, which is to copy either one file to
|
|
another, or several files to another directory.
|
|
|
|
|
|
\subsubsection{What are positional arguments for?\label{optparse-what-positional-arguments-for}}
|
|
|
|
Positional arguments are for those pieces of information that your
|
|
program absolutely, positively requires to run.
|
|
|
|
A good user interface should have as few absolute requirements as
|
|
possible. If your program requires 17 distinct pieces of information in
|
|
order to run successfully, it doesn't much matter \emph{how} you get that
|
|
information from the user{---}most people will give up and walk away
|
|
before they successfully run the program. This applies whether the user
|
|
interface is a command-line, a configuration file, or a GUI: if you make
|
|
that many demands on your users, most of them will simply give up.
|
|
|
|
In short, try to minimize the amount of information that users are
|
|
absolutely required to supply{---}use sensible defaults whenever
|
|
possible. Of course, you also want to make your programs reasonably
|
|
flexible. That's what options are for. Again, it doesn't matter if
|
|
they are entries in a config file, widgets in the ``Preferences'' dialog
|
|
of a GUI, or command-line options{---}the more options you implement, the
|
|
more flexible your program is, and the more complicated its
|
|
implementation becomes. Too much flexibility has drawbacks as well, of
|
|
course; too many options can overwhelm users and make your code much
|
|
harder to maintain.
|
|
% $Id: tao.txt 413 2004-09-28 00:59:13Z greg $
|
|
|
|
|
|
\subsection{Tutorial\label{optparse-tutorial}}
|
|
|
|
While \module{optparse} is quite flexible and powerful, it's also straightforward to
|
|
use in most cases. This section covers the code patterns that are
|
|
common to any \module{optparse}-based program.
|
|
|
|
First, you need to import the OptionParser class; then, early in the
|
|
main program, create an OptionParser instance:
|
|
\begin{verbatim}
|
|
from optparse import OptionParser
|
|
[...]
|
|
parser = OptionParser()
|
|
\end{verbatim}
|
|
|
|
Then you can start defining options. The basic syntax is:
|
|
\begin{verbatim}
|
|
parser.add_option(opt_str, ...,
|
|
attr=value, ...)
|
|
\end{verbatim}
|
|
|
|
Each option has one or more option strings, such as \code{"-f"} or
|
|
\code{"-{}-file"}, and several option attributes that tell \module{optparse} what to
|
|
expect and what to do when it encounters that option on the command
|
|
line.
|
|
|
|
Typically, each option will have one short option string and one long
|
|
option string, e.g.:
|
|
\begin{verbatim}
|
|
parser.add_option("-f", "--file", ...)
|
|
\end{verbatim}
|
|
|
|
You're free to define as many short option strings and as many long
|
|
option strings as you like (including zero), as long as there is at
|
|
least one option string overall.
|
|
|
|
The option strings passed to \method{add{\_}option()} are effectively labels for
|
|
the option defined by that call. For brevity, we will frequently refer
|
|
to \emph{encountering an option} on the command line; in reality, \module{optparse}
|
|
encounters \emph{option strings} and looks up options from them.
|
|
|
|
Once all of your options are defined, instruct \module{optparse} to parse your
|
|
program's command line:
|
|
\begin{verbatim}
|
|
(options, args) = parser.parse_args()
|
|
\end{verbatim}
|
|
|
|
(If you like, you can pass a custom argument list to \method{parse{\_}args()},
|
|
but that's rarely necessary: by default it uses \code{sys.argv{[}1:]}.)
|
|
|
|
\method{parse{\_}args()} returns two values:
|
|
\begin{itemize}
|
|
\item {}
|
|
\code{options}, an object containing values for all of your options{---}e.g. if \code{"-{}-file"} takes a single string argument, then
|
|
\code{options.file} will be the filename supplied by the user, or
|
|
\code{None} if the user did not supply that option
|
|
|
|
\item {}
|
|
\code{args}, the list of positional arguments leftover after parsing
|
|
options
|
|
|
|
\end{itemize}
|
|
|
|
This tutorial section only covers the four most important option
|
|
attributes: \member{action}, \member{type}, \member{dest} (destination), and \member{help}.
|
|
Of these, \member{action} is the most fundamental.
|
|
|
|
|
|
\subsubsection{Understanding option actions\label{optparse-understanding-option-actions}}
|
|
|
|
Actions tell \module{optparse} what to do when it encounters an option on the
|
|
command line. There is a fixed set of actions hard-coded into \module{optparse};
|
|
adding new actions is an advanced topic covered in section~\ref{optparse-extending-optparse}, Extending \module{optparse}.
|
|
Most actions tell \module{optparse} to store a value in some variable{---}for
|
|
example, take a string from the command line and store it in an
|
|
attribute of \code{options}.
|
|
|
|
If you don't specify an option action, \module{optparse} defaults to \code{store}.
|
|
|
|
|
|
\subsubsection{The store action\label{optparse-store-action}}
|
|
|
|
The most common option action is \code{store}, which tells \module{optparse} to take
|
|
the next argument (or the remainder of the current argument), ensure
|
|
that it is of the correct type, and store it to your chosen destination.
|
|
|
|
For example:
|
|
\begin{verbatim}
|
|
parser.add_option("-f", "--file",
|
|
action="store", type="string", dest="filename")
|
|
\end{verbatim}
|
|
|
|
Now let's make up a fake command line and ask \module{optparse} to parse it:
|
|
\begin{verbatim}
|
|
args = ["-f", "foo.txt"]
|
|
(options, args) = parser.parse_args(args)
|
|
\end{verbatim}
|
|
|
|
When \module{optparse} sees the option string \code{"-f"}, it consumes the next
|
|
argument, \code{"foo.txt"}, and stores it in \code{options.filename}. So,
|
|
after this call to \method{parse{\_}args()}, \code{options.filename} is
|
|
\code{"foo.txt"}.
|
|
|
|
Some other option types supported by \module{optparse} are \code{int} and \code{float}.
|
|
Here's an option that expects an integer argument:
|
|
\begin{verbatim}
|
|
parser.add_option("-n", type="int", dest="num")
|
|
\end{verbatim}
|
|
|
|
Note that this option has no long option string, which is perfectly
|
|
acceptable. Also, there's no explicit action, since the default is
|
|
\code{store}.
|
|
|
|
Let's parse another fake command-line. This time, we'll jam the option
|
|
argument right up against the option: since \code{"-n42"} (one argument) is
|
|
equivalent to \code{"-n 42"} (two arguments), the code
|
|
\begin{verbatim}
|
|
(options, args) = parser.parse_args(["-n42"])
|
|
print options.num
|
|
\end{verbatim}
|
|
|
|
will print \code{"42"}.
|
|
|
|
If you don't specify a type, \module{optparse} assumes \code{string}. Combined with the
|
|
fact that the default action is \code{store}, that means our first example
|
|
can be a lot shorter:
|
|
\begin{verbatim}
|
|
parser.add_option("-f", "--file", dest="filename")
|
|
\end{verbatim}
|
|
|
|
If you don't supply a destination, \module{optparse} figures out a sensible default
|
|
from the option strings: if the first long option string is
|
|
\code{"-{}-foo-bar"}, then the default destination is \code{foo{\_}bar}. If there
|
|
are no long option strings, \module{optparse} looks at the first short option
|
|
string: the default destination for \code{"-f"} is \code{f}.
|
|
|
|
\module{optparse} also includes built-in \code{long} and \code{complex} types. Adding
|
|
types is covered in section~\ref{optparse-extending-optparse}, Extending \module{optparse}.
|
|
|
|
|
|
\subsubsection{Handling boolean (flag) options\label{optparse-handling-boolean-options}}
|
|
|
|
Flag options{---}set a variable to true or false when a particular option
|
|
is seen{---}are quite common. \module{optparse} supports them with two separate
|
|
actions, \code{store{\_}true} and \code{store{\_}false}. For example, you might have a
|
|
\code{verbose} flag that is turned on with \code{"-v"} and off with \code{"-q"}:
|
|
\begin{verbatim}
|
|
parser.add_option("-v", action="store_true", dest="verbose")
|
|
parser.add_option("-q", action="store_false", dest="verbose")
|
|
\end{verbatim}
|
|
|
|
Here we have two different options with the same destination, which is
|
|
perfectly OK. (It just means you have to be a bit careful when setting
|
|
default values{---}see below.)
|
|
|
|
When \module{optparse} encounters \code{"-v"} on the command line, it sets
|
|
\code{options.verbose} to \code{True}; when it encounters \code{"-q"},
|
|
\code{options.verbose} is set to \code{False}.
|
|
|
|
|
|
\subsubsection{Other actions\label{optparse-other-actions}}
|
|
|
|
Some other actions supported by \module{optparse} are:
|
|
\begin{description}
|
|
\item[\code{store{\_}const}]
|
|
store a constant value
|
|
\item[\code{append}]
|
|
append this option's argument to a list
|
|
\item[\code{count}]
|
|
increment a counter by one
|
|
\item[\code{callback}]
|
|
call a specified function
|
|
\end{description}
|
|
|
|
These are covered in section~\ref{optparse-reference-guide}, Reference Guide and section~\ref{optparse-option-callbacks}, Option Callbacks.
|
|
|
|
|
|
\subsubsection{Default values\label{optparse-default-values}}
|
|
|
|
All of the above examples involve setting some variable (the
|
|
``destination'') when certain command-line options are seen. What happens
|
|
if those options are never seen? Since we didn't supply any defaults,
|
|
they are all set to \code{None}. This is usually fine, but sometimes you
|
|
want more control. \module{optparse} lets you supply a default value for each
|
|
destination, which is assigned before the command line is parsed.
|
|
|
|
First, consider the verbose/quiet example. If we want \module{optparse} to set
|
|
\code{verbose} to \code{True} unless \code{"-q"} is seen, then we can do this:
|
|
\begin{verbatim}
|
|
parser.add_option("-v", action="store_true", dest="verbose", default=True)
|
|
parser.add_option("-q", action="store_false", dest="verbose")
|
|
\end{verbatim}
|
|
|
|
Since default values apply to the \emph{destination} rather than to any
|
|
particular option, and these two options happen to have the same
|
|
destination, this is exactly equivalent:
|
|
\begin{verbatim}
|
|
parser.add_option("-v", action="store_true", dest="verbose")
|
|
parser.add_option("-q", action="store_false", dest="verbose", default=True)
|
|
\end{verbatim}
|
|
|
|
Consider this:
|
|
\begin{verbatim}
|
|
parser.add_option("-v", action="store_true", dest="verbose", default=False)
|
|
parser.add_option("-q", action="store_false", dest="verbose", default=True)
|
|
\end{verbatim}
|
|
|
|
Again, the default value for \code{verbose} will be \code{True}: the last
|
|
default value supplied for any particular destination is the one that
|
|
counts.
|
|
|
|
A clearer way to specify default values is the \method{set{\_}defaults()}
|
|
method of OptionParser, which you can call at any time before calling
|
|
\method{parse{\_}args()}:
|
|
\begin{verbatim}
|
|
parser.set_defaults(verbose=True)
|
|
parser.add_option(...)
|
|
(options, args) = parser.parse_args()
|
|
\end{verbatim}
|
|
|
|
As before, the last value specified for a given option destination is
|
|
the one that counts. For clarity, try to use one method or the other of
|
|
setting default values, not both.
|
|
|
|
|
|
\subsubsection{Generating help\label{optparse-generating-help}}
|
|
|
|
\module{optparse}'s ability to generate help and usage text automatically is useful
|
|
for creating user-friendly command-line interfaces. All you have to do
|
|
is supply a \member{help} value for each option, and optionally a short usage
|
|
message for your whole program. Here's an OptionParser populated with
|
|
user-friendly (documented) options:
|
|
\begin{verbatim}
|
|
usage = "usage: %prog [options] arg1 arg2"
|
|
parser = OptionParser(usage=usage)
|
|
parser.add_option("-v", "--verbose",
|
|
action="store_true", dest="verbose", default=True,
|
|
help="make lots of noise [default]")
|
|
parser.add_option("-q", "--quiet",
|
|
action="store_false", dest="verbose",
|
|
help="be vewwy quiet (I'm hunting wabbits)")
|
|
parser.add_option("-f", "--filename",
|
|
metavar="FILE", help="write output to FILE"),
|
|
parser.add_option("-m", "--mode",
|
|
default="intermediate",
|
|
help="interaction mode: novice, intermediate, "
|
|
"or expert [default: %default]")
|
|
\end{verbatim}
|
|
|
|
If \module{optparse} encounters either \code{"-h"} or \code{"-{}-help"} on the command-line,
|
|
or if you just call \method{parser.print{\_}help()}, it prints the following to
|
|
standard output:
|
|
\begin{verbatim}
|
|
usage: <yourscript> [options] arg1 arg2
|
|
|
|
options:
|
|
-h, --help show this help message and exit
|
|
-v, --verbose make lots of noise [default]
|
|
-q, --quiet be vewwy quiet (I'm hunting wabbits)
|
|
-f FILE, --filename=FILE
|
|
write output to FILE
|
|
-m MODE, --mode=MODE interaction mode: novice, intermediate, or
|
|
expert [default: intermediate]
|
|
\end{verbatim}
|
|
|
|
(If the help output is triggered by a help option, \module{optparse} exits after
|
|
printing the help text.)
|
|
|
|
There's a lot going on here to help \module{optparse} generate the best possible
|
|
help message:
|
|
\begin{itemize}
|
|
\item {}
|
|
the script defines its own usage message:
|
|
\begin{verbatim}
|
|
usage = "usage: %prog [options] arg1 arg2"
|
|
\end{verbatim}
|
|
|
|
\module{optparse} expands \code{"{\%}prog"} in the usage string to the name of the current
|
|
program, i.e. \code{os.path.basename(sys.argv{[}0])}. The expanded string
|
|
is then printed before the detailed option help.
|
|
|
|
If you don't supply a usage string, \module{optparse} uses a bland but sensible
|
|
default: \code{"usage: {\%}prog {[}options]"}, which is fine if your script
|
|
doesn't take any positional arguments.
|
|
|
|
\item {}
|
|
every option defines a help string, and doesn't worry about line-
|
|
wrapping{---}\module{optparse} takes care of wrapping lines and making the
|
|
help output look good.
|
|
|
|
\item {}
|
|
options that take a value indicate this fact in their
|
|
automatically-generated help message, e.g. for the ``mode'' option:
|
|
\begin{verbatim}
|
|
-m MODE, --mode=MODE
|
|
\end{verbatim}
|
|
|
|
Here, ``MODE'' is called the meta-variable: it stands for the argument
|
|
that the user is expected to supply to \programopt{-m}/\longprogramopt{mode}. By default,
|
|
\module{optparse} converts the destination variable name to uppercase and uses
|
|
that for the meta-variable. Sometimes, that's not what you want{---}for example, the \longprogramopt{filename} option explicitly sets
|
|
\code{metavar="FILE"}, resulting in this automatically-generated option
|
|
description:
|
|
\begin{verbatim}
|
|
-f FILE, --filename=FILE
|
|
\end{verbatim}
|
|
|
|
This is important for more than just saving space, though: the
|
|
manually written help text uses the meta-variable ``FILE'' to clue the
|
|
user in that there's a connection between the semi-formal syntax ``-f
|
|
FILE'' and the informal semantic description ``write output to FILE''.
|
|
This is a simple but effective way to make your help text a lot
|
|
clearer and more useful for end users.
|
|
|
|
\item {}
|
|
options that have a default value can include \code{{\%}default} in
|
|
the help string{---}\module{optparse} will replace it with \function{str()} of the
|
|
option's default value. If an option has no default value (or the
|
|
default value is \code{None}), \code{{\%}default} expands to \code{none}.
|
|
|
|
\end{itemize}
|
|
|
|
|
|
\subsubsection{Printing a version string\label{optparse-printing-version-string}}
|
|
|
|
Similar to the brief usage string, \module{optparse} can also print a version string
|
|
for your program. You have to supply the string as the \code{version}
|
|
argument to OptionParser:
|
|
\begin{verbatim}
|
|
parser = OptionParser(usage="%prog [-f] [-q]", version="%prog 1.0")
|
|
\end{verbatim}
|
|
|
|
\code{"{\%}prog"} is expanded just like it is in \code{usage}. Apart
|
|
from that, \code{version} can contain anything you like. When you supply
|
|
it, \module{optparse} automatically adds a \code{"-{}-version"} option to your parser.
|
|
If it encounters this option on the command line, it expands your
|
|
\code{version} string (by replacing \code{"{\%}prog"}), prints it to stdout, and
|
|
exits.
|
|
|
|
For example, if your script is called \code{/usr/bin/foo}:
|
|
\begin{verbatim}
|
|
$ /usr/bin/foo --version
|
|
foo 1.0
|
|
\end{verbatim}
|
|
|
|
|
|
\subsubsection{How \module{optparse} handles errors\label{optparse-how-optparse-handles-errors}}
|
|
|
|
There are two broad classes of errors that \module{optparse} has to worry about:
|
|
programmer errors and user errors. Programmer errors are usually
|
|
erroneous calls to \code{parser.add{\_}option()}, e.g. invalid option strings,
|
|
unknown option attributes, missing option attributes, etc. These are
|
|
dealt with in the usual way: raise an exception (either
|
|
\code{optparse.OptionError} or \code{TypeError}) and let the program crash.
|
|
|
|
Handling user errors is much more important, since they are guaranteed
|
|
to happen no matter how stable your code is. \module{optparse} can automatically
|
|
detect some user errors, such as bad option arguments (passing \code{"-n
|
|
4x"} where \programopt{-n} takes an integer argument), missing arguments
|
|
(\code{"-n"} at the end of the command line, where \programopt{-n} takes an argument
|
|
of any type). Also, you can call \code{parser.error()} to signal an
|
|
application-defined error condition:
|
|
\begin{verbatim}
|
|
(options, args) = parser.parse_args()
|
|
[...]
|
|
if options.a and options.b:
|
|
parser.error("options -a and -b are mutually exclusive")
|
|
\end{verbatim}
|
|
|
|
In either case, \module{optparse} handles the error the same way: it prints the
|
|
program's usage message and an error message to standard error and
|
|
exits with error status 2.
|
|
|
|
Consider the first example above, where the user passes \code{"4x"} to an
|
|
option that takes an integer:
|
|
\begin{verbatim}
|
|
$ /usr/bin/foo -n 4x
|
|
usage: foo [options]
|
|
|
|
foo: error: option -n: invalid integer value: '4x'
|
|
\end{verbatim}
|
|
|
|
Or, where the user fails to pass a value at all:
|
|
\begin{verbatim}
|
|
$ /usr/bin/foo -n
|
|
usage: foo [options]
|
|
|
|
foo: error: -n option requires an argument
|
|
\end{verbatim}
|
|
|
|
\module{optparse}-generated error messages take care always to mention the option
|
|
involved in the error; be sure to do the same when calling
|
|
\code{parser.error()} from your application code.
|
|
|
|
If \module{optparse}'s default error-handling behaviour does not suite your needs,
|
|
you'll need to subclass OptionParser and override \code{exit()} and/or
|
|
\method{error()}.
|
|
|
|
|
|
\subsubsection{Putting it all together\label{optparse-putting-it-all-together}}
|
|
|
|
Here's what \module{optparse}-based scripts usually look like:
|
|
\begin{verbatim}
|
|
from optparse import OptionParser
|
|
[...]
|
|
def main():
|
|
usage = "usage: %prog [options] arg"
|
|
parser = OptionParser(usage)
|
|
parser.add_option("-f", "--file", dest="filename",
|
|
help="read data from FILENAME")
|
|
parser.add_option("-v", "--verbose",
|
|
action="store_true", dest="verbose")
|
|
parser.add_option("-q", "--quiet",
|
|
action="store_false", dest="verbose")
|
|
[...]
|
|
(options, args) = parser.parse_args()
|
|
if len(args) != 1:
|
|
parser.error("incorrect number of arguments")
|
|
if options.verbose:
|
|
print "reading %s..." % options.filename
|
|
[...]
|
|
|
|
if __name__ == "__main__":
|
|
main()
|
|
\end{verbatim}
|
|
% $Id: tutorial.txt 515 2006-06-10 15:37:45Z gward $
|
|
|
|
|
|
\subsection{Reference Guide\label{optparse-reference-guide}}
|
|
|
|
|
|
\subsubsection{Creating the parser\label{optparse-creating-parser}}
|
|
|
|
The first step in using \module{optparse} is to create an OptionParser instance:
|
|
\begin{verbatim}
|
|
parser = OptionParser(...)
|
|
\end{verbatim}
|
|
|
|
The OptionParser constructor has no required arguments, but a number of
|
|
optional keyword arguments. You should always pass them as keyword
|
|
arguments, i.e. do not rely on the order in which the arguments are
|
|
declared.
|
|
\begin{quote}
|
|
\begin{description}
|
|
\item[\code{usage} (default: \code{"{\%}prog {[}options]"})]
|
|
The usage summary to print when your program is run incorrectly or
|
|
with a help option. When \module{optparse} prints the usage string, it expands
|
|
\code{{\%}prog} to \code{os.path.basename(sys.argv{[}0])} (or to \code{prog} if
|
|
you passed that keyword argument). To suppress a usage message,
|
|
pass the special value \code{optparse.SUPPRESS{\_}USAGE}.
|
|
\item[\code{option{\_}list} (default: \code{{[}]})]
|
|
A list of Option objects to populate the parser with. The options
|
|
in \code{option{\_}list} are added after any options in
|
|
\code{standard{\_}option{\_}list} (a class attribute that may be set by
|
|
OptionParser subclasses), but before any version or help options.
|
|
Deprecated; use \method{add{\_}option()} after creating the parser instead.
|
|
\item[\code{option{\_}class} (default: optparse.Option)]
|
|
Class to use when adding options to the parser in \method{add{\_}option()}.
|
|
\item[\code{version} (default: \code{None})]
|
|
A version string to print when the user supplies a version option.
|
|
If you supply a true value for \code{version}, \module{optparse} automatically adds
|
|
a version option with the single option string \code{"-{}-version"}. The
|
|
substring \code{"{\%}prog"} is expanded the same as for \code{usage}.
|
|
\item[\code{conflict{\_}handler} (default: \code{"error"})]
|
|
Specifies what to do when options with conflicting option strings
|
|
are added to the parser; see section~\ref{optparse-conflicts-between-options}, Conflicts between options.
|
|
\item[\code{description} (default: \code{None})]
|
|
A paragraph of text giving a brief overview of your program. \module{optparse}
|
|
reformats this paragraph to fit the current terminal width and
|
|
prints it when the user requests help (after \code{usage}, but before
|
|
the list of options).
|
|
\item[\code{formatter} (default: a new IndentedHelpFormatter)]
|
|
An instance of optparse.HelpFormatter that will be used for
|
|
printing help text. \module{optparse} provides two concrete classes for this
|
|
purpose: IndentedHelpFormatter and TitledHelpFormatter.
|
|
\item[\code{add{\_}help{\_}option} (default: \code{True})]
|
|
If true, \module{optparse} will add a help option (with option strings \code{"-h"}
|
|
and \code{"-{}-help"}) to the parser.
|
|
\item[\code{prog}]
|
|
The string to use when expanding \code{"{\%}prog"} in \code{usage} and
|
|
\code{version} instead of \code{os.path.basename(sys.argv{[}0])}.
|
|
\end{description}
|
|
\end{quote}
|
|
|
|
|
|
\subsubsection{Populating the parser\label{optparse-populating-parser}}
|
|
|
|
There are several ways to populate the parser with options. The
|
|
preferred way is by using \code{OptionParser.add{\_}option()}, as shown in
|
|
section~\ref{optparse-tutorial}, the tutorial. \method{add{\_}option()} can be called in one of two
|
|
ways:
|
|
\begin{itemize}
|
|
\item {}
|
|
pass it an Option instance (as returned by \function{make{\_}option()})
|
|
|
|
\item {}
|
|
pass it any combination of positional and keyword arguments that are
|
|
acceptable to \function{make{\_}option()} (i.e., to the Option constructor),
|
|
and it will create the Option instance for you
|
|
|
|
\end{itemize}
|
|
|
|
The other alternative is to pass a list of pre-constructed Option
|
|
instances to the OptionParser constructor, as in:
|
|
\begin{verbatim}
|
|
option_list = [
|
|
make_option("-f", "--filename",
|
|
action="store", type="string", dest="filename"),
|
|
make_option("-q", "--quiet",
|
|
action="store_false", dest="verbose"),
|
|
]
|
|
parser = OptionParser(option_list=option_list)
|
|
\end{verbatim}
|
|
|
|
(\function{make{\_}option()} is a factory function for creating Option instances;
|
|
currently it is an alias for the Option constructor. A future version
|
|
of \module{optparse} may split Option into several classes, and \function{make{\_}option()}
|
|
will pick the right class to instantiate. Do not instantiate Option
|
|
directly.)
|
|
|
|
|
|
\subsubsection{Defining options\label{optparse-defining-options}}
|
|
|
|
Each Option instance represents a set of synonymous command-line option
|
|
strings, e.g. \programopt{-f} and \longprogramopt{file}. You can
|
|
specify any number of short or long option strings, but you must specify
|
|
at least one overall option string.
|
|
|
|
The canonical way to create an Option instance is with the
|
|
\method{add{\_}option()} method of \class{OptionParser}:
|
|
\begin{verbatim}
|
|
parser.add_option(opt_str[, ...], attr=value, ...)
|
|
\end{verbatim}
|
|
|
|
To define an option with only a short option string:
|
|
\begin{verbatim}
|
|
parser.add_option("-f", attr=value, ...)
|
|
\end{verbatim}
|
|
|
|
And to define an option with only a long option string:
|
|
\begin{verbatim}
|
|
parser.add_option("--foo", attr=value, ...)
|
|
\end{verbatim}
|
|
|
|
The keyword arguments define attributes of the new Option object. The
|
|
most important option attribute is \member{action}, and it largely determines
|
|
which other attributes are relevant or required. If you pass irrelevant
|
|
option attributes, or fail to pass required ones, \module{optparse} raises an
|
|
OptionError exception explaining your mistake.
|
|
|
|
An options's \emph{action} determines what \module{optparse} does when it encounters this
|
|
option on the command-line. The standard option actions hard-coded into
|
|
\module{optparse} are:
|
|
\begin{description}
|
|
\item[\code{store}]
|
|
store this option's argument (default)
|
|
\item[\code{store{\_}const}]
|
|
store a constant value
|
|
\item[\code{store{\_}true}]
|
|
store a true value
|
|
\item[\code{store{\_}false}]
|
|
store a false value
|
|
\item[\code{append}]
|
|
append this option's argument to a list
|
|
\item[\code{append{\_}const}]
|
|
append a constant value to a list
|
|
\item[\code{count}]
|
|
increment a counter by one
|
|
\item[\code{callback}]
|
|
call a specified function
|
|
\item[\member{help}]
|
|
print a usage message including all options and the
|
|
documentation for them
|
|
\end{description}
|
|
|
|
(If you don't supply an action, the default is \code{store}. For this
|
|
action, you may also supply \member{type} and \member{dest} option attributes; see
|
|
below.)
|
|
|
|
As you can see, most actions involve storing or updating a value
|
|
somewhere. \module{optparse} always creates a special object for this,
|
|
conventionally called \code{options} (it happens to be an instance of
|
|
\code{optparse.Values}). Option arguments (and various other values) are
|
|
stored as attributes of this object, according to the \member{dest}
|
|
(destination) option attribute.
|
|
|
|
For example, when you call
|
|
\begin{verbatim}
|
|
parser.parse_args()
|
|
\end{verbatim}
|
|
|
|
one of the first things \module{optparse} does is create the \code{options} object:
|
|
\begin{verbatim}
|
|
options = Values()
|
|
\end{verbatim}
|
|
|
|
If one of the options in this parser is defined with
|
|
\begin{verbatim}
|
|
parser.add_option("-f", "--file", action="store", type="string", dest="filename")
|
|
\end{verbatim}
|
|
|
|
and the command-line being parsed includes any of the following:
|
|
\begin{verbatim}
|
|
-ffoo
|
|
-f foo
|
|
--file=foo
|
|
--file foo
|
|
\end{verbatim}
|
|
|
|
then \module{optparse}, on seeing this option, will do the equivalent of
|
|
\begin{verbatim}
|
|
options.filename = "foo"
|
|
\end{verbatim}
|
|
|
|
The \member{type} and \member{dest} option attributes are almost as important as
|
|
\member{action}, but \member{action} is the only one that makes sense for \emph{all}
|
|
options.
|
|
|
|
|
|
\subsubsection{Standard option actions\label{optparse-standard-option-actions}}
|
|
|
|
The various option actions all have slightly different requirements and
|
|
effects. Most actions have several relevant option attributes which you
|
|
may specify to guide \module{optparse}'s behaviour; a few have required attributes,
|
|
which you must specify for any option using that action.
|
|
\begin{itemize}
|
|
\item {}
|
|
\code{store} {[}relevant: \member{type}, \member{dest}, \code{nargs}, \code{choices}]
|
|
|
|
The option must be followed by an argument, which is
|
|
converted to a value according to \member{type} and stored in
|
|
\member{dest}. If \code{nargs} {\textgreater} 1, multiple arguments will be consumed
|
|
from the command line; all will be converted according to
|
|
\member{type} and stored to \member{dest} as a tuple. See the ``Option
|
|
types'' section below.
|
|
|
|
If \code{choices} is supplied (a list or tuple of strings), the type
|
|
defaults to \code{choice}.
|
|
|
|
If \member{type} is not supplied, it defaults to \code{string}.
|
|
|
|
If \member{dest} is not supplied, \module{optparse} derives a destination from the
|
|
first long option string (e.g., \code{"-{}-foo-bar"} implies \code{foo{\_}bar}).
|
|
If there are no long option strings, \module{optparse} derives a destination from
|
|
the first short option string (e.g., \code{"-f"} implies \code{f}).
|
|
|
|
Example:
|
|
\begin{verbatim}
|
|
parser.add_option("-f")
|
|
parser.add_option("-p", type="float", nargs=3, dest="point")
|
|
\end{verbatim}
|
|
|
|
As it parses the command line
|
|
\begin{verbatim}
|
|
-f foo.txt -p 1 -3.5 4 -fbar.txt
|
|
\end{verbatim}
|
|
|
|
\module{optparse} will set
|
|
\begin{verbatim}
|
|
options.f = "foo.txt"
|
|
options.point = (1.0, -3.5, 4.0)
|
|
options.f = "bar.txt"
|
|
\end{verbatim}
|
|
|
|
\item {}
|
|
\code{store{\_}const} {[}required: \code{const}; relevant: \member{dest}]
|
|
|
|
The value \code{const} is stored in \member{dest}.
|
|
|
|
Example:
|
|
\begin{verbatim}
|
|
parser.add_option("-q", "--quiet",
|
|
action="store_const", const=0, dest="verbose")
|
|
parser.add_option("-v", "--verbose",
|
|
action="store_const", const=1, dest="verbose")
|
|
parser.add_option("--noisy",
|
|
action="store_const", const=2, dest="verbose")
|
|
\end{verbatim}
|
|
|
|
If \code{"-{}-noisy"} is seen, \module{optparse} will set
|
|
\begin{verbatim}
|
|
options.verbose = 2
|
|
\end{verbatim}
|
|
|
|
\item {}
|
|
\code{store{\_}true} {[}relevant: \member{dest}]
|
|
|
|
A special case of \code{store{\_}const} that stores a true value
|
|
to \member{dest}.
|
|
|
|
\item {}
|
|
\code{store{\_}false} {[}relevant: \member{dest}]
|
|
|
|
Like \code{store{\_}true}, but stores a false value.
|
|
|
|
Example:
|
|
\begin{verbatim}
|
|
parser.add_option("--clobber", action="store_true", dest="clobber")
|
|
parser.add_option("--no-clobber", action="store_false", dest="clobber")
|
|
\end{verbatim}
|
|
|
|
\item {}
|
|
\code{append} {[}relevant: \member{type}, \member{dest}, \code{nargs}, \code{choices}]
|
|
|
|
The option must be followed by an argument, which is appended to the
|
|
list in \member{dest}. If no default value for \member{dest} is supplied, an
|
|
empty list is automatically created when \module{optparse} first encounters this
|
|
option on the command-line. If \code{nargs} {\textgreater} 1, multiple arguments are
|
|
consumed, and a tuple of length \code{nargs} is appended to \member{dest}.
|
|
|
|
The defaults for \member{type} and \member{dest} are the same as for the
|
|
\code{store} action.
|
|
|
|
Example:
|
|
\begin{verbatim}
|
|
parser.add_option("-t", "--tracks", action="append", type="int")
|
|
\end{verbatim}
|
|
|
|
If \code{"-t3"} is seen on the command-line, \module{optparse} does the equivalent of:
|
|
\begin{verbatim}
|
|
options.tracks = []
|
|
options.tracks.append(int("3"))
|
|
\end{verbatim}
|
|
|
|
If, a little later on, \code{"-{}-tracks=4"} is seen, it does:
|
|
\begin{verbatim}
|
|
options.tracks.append(int("4"))
|
|
\end{verbatim}
|
|
|
|
\item {}
|
|
\code{append{\_}const} {[}required: \code{const}; relevant: \member{dest}]
|
|
|
|
Like \code{store{\_}const}, but the value \code{const} is appended to \member{dest};
|
|
as with \code{append}, \member{dest} defaults to \code{None}, and an an empty list is
|
|
automatically created the first time the option is encountered.
|
|
|
|
\item {}
|
|
\code{count} {[}relevant: \member{dest}]
|
|
|
|
Increment the integer stored at \member{dest}. If no default value is
|
|
supplied, \member{dest} is set to zero before being incremented the first
|
|
time.
|
|
|
|
Example:
|
|
\begin{verbatim}
|
|
parser.add_option("-v", action="count", dest="verbosity")
|
|
\end{verbatim}
|
|
|
|
The first time \code{"-v"} is seen on the command line, \module{optparse} does the
|
|
equivalent of:
|
|
\begin{verbatim}
|
|
options.verbosity = 0
|
|
options.verbosity += 1
|
|
\end{verbatim}
|
|
|
|
Every subsequent occurrence of \code{"-v"} results in
|
|
\begin{verbatim}
|
|
options.verbosity += 1
|
|
\end{verbatim}
|
|
|
|
\item {}
|
|
\code{callback} {[}required: \code{callback};
|
|
relevant: \member{type}, \code{nargs}, \code{callback{\_}args}, \code{callback{\_}kwargs}]
|
|
|
|
Call the function specified by \code{callback}, which is called as
|
|
\begin{verbatim}
|
|
func(option, opt_str, value, parser, *args, **kwargs)
|
|
\end{verbatim}
|
|
|
|
See section~\ref{optparse-option-callbacks}, Option Callbacks for more detail.
|
|
|
|
\item {}
|
|
\member{help}
|
|
|
|
Prints a complete help message for all the options in the
|
|
current option parser. The help message is constructed from
|
|
the \code{usage} string passed to OptionParser's constructor and
|
|
the \member{help} string passed to every option.
|
|
|
|
If no \member{help} string is supplied for an option, it will still be
|
|
listed in the help message. To omit an option entirely, use
|
|
the special value \code{optparse.SUPPRESS{\_}HELP}.
|
|
|
|
\module{optparse} automatically adds a \member{help} option to all OptionParsers, so
|
|
you do not normally need to create one.
|
|
|
|
Example:
|
|
\begin{verbatim}
|
|
from optparse import OptionParser, SUPPRESS_HELP
|
|
|
|
parser = OptionParser()
|
|
parser.add_option("-h", "--help", action="help"),
|
|
parser.add_option("-v", action="store_true", dest="verbose",
|
|
help="Be moderately verbose")
|
|
parser.add_option("--file", dest="filename",
|
|
help="Input file to read data from"),
|
|
parser.add_option("--secret", help=SUPPRESS_HELP)
|
|
\end{verbatim}
|
|
|
|
If \module{optparse} sees either \code{"-h"} or \code{"-{}-help"} on the command line, it
|
|
will print something like the following help message to stdout
|
|
(assuming \code{sys.argv{[}0]} is \code{"foo.py"}):
|
|
\begin{verbatim}
|
|
usage: foo.py [options]
|
|
|
|
options:
|
|
-h, --help Show this help message and exit
|
|
-v Be moderately verbose
|
|
--file=FILENAME Input file to read data from
|
|
\end{verbatim}
|
|
|
|
After printing the help message, \module{optparse} terminates your process
|
|
with \code{sys.exit(0)}.
|
|
|
|
\item {}
|
|
\code{version}
|
|
|
|
Prints the version number supplied to the OptionParser to stdout and
|
|
exits. The version number is actually formatted and printed by the
|
|
\code{print{\_}version()} method of OptionParser. Generally only relevant
|
|
if the \code{version} argument is supplied to the OptionParser
|
|
constructor. As with \member{help} options, you will rarely create
|
|
\code{version} options, since \module{optparse} automatically adds them when needed.
|
|
|
|
\end{itemize}
|
|
|
|
|
|
\subsubsection{Option attributes\label{optparse-option-attributes}}
|
|
|
|
The following option attributes may be passed as keyword arguments
|
|
to \code{parser.add{\_}option()}. If you pass an option attribute
|
|
that is not relevant to a particular option, or fail to pass a required
|
|
option attribute, \module{optparse} raises OptionError.
|
|
\begin{itemize}
|
|
\item {}
|
|
\member{action} (default: \code{"store"})
|
|
|
|
Determines \module{optparse}'s behaviour when this option is seen on the command
|
|
line; the available options are documented above.
|
|
|
|
\item {}
|
|
\member{type} (default: \code{"string"})
|
|
|
|
The argument type expected by this option (e.g., \code{"string"} or
|
|
\code{"int"}); the available option types are documented below.
|
|
|
|
\item {}
|
|
\member{dest} (default: derived from option strings)
|
|
|
|
If the option's action implies writing or modifying a value somewhere,
|
|
this tells \module{optparse} where to write it: \member{dest} names an attribute of the
|
|
\code{options} object that \module{optparse} builds as it parses the command line.
|
|
|
|
\item {}
|
|
\code{default} (deprecated)
|
|
|
|
The value to use for this option's destination if the option is not
|
|
seen on the command line. Deprecated; use \code{parser.set{\_}defaults()}
|
|
instead.
|
|
|
|
\item {}
|
|
\code{nargs} (default: 1)
|
|
|
|
How many arguments of type \member{type} should be consumed when this
|
|
option is seen. If {\textgreater} 1, \module{optparse} will store a tuple of values to
|
|
\member{dest}.
|
|
|
|
\item {}
|
|
\code{const}
|
|
|
|
For actions that store a constant value, the constant value to store.
|
|
|
|
\item {}
|
|
\code{choices}
|
|
|
|
For options of type \code{"choice"}, the list of strings the user
|
|
may choose from.
|
|
|
|
\item {}
|
|
\code{callback}
|
|
|
|
For options with action \code{"callback"}, the callable to call when this
|
|
option is seen. See section~\ref{optparse-option-callbacks}, Option Callbacks for detail on the arguments
|
|
passed to \code{callable}.
|
|
|
|
\item {}
|
|
\code{callback{\_}args}, \code{callback{\_}kwargs}
|
|
|
|
Additional positional and keyword arguments to pass to \code{callback}
|
|
after the four standard callback arguments.
|
|
|
|
\item {}
|
|
\member{help}
|
|
|
|
Help text to print for this option when listing all available options
|
|
after the user supplies a \member{help} option (such as \code{"-{}-help"}).
|
|
If no help text is supplied, the option will be listed without help
|
|
text. To hide this option, use the special value \code{SUPPRESS{\_}HELP}.
|
|
|
|
\item {}
|
|
\code{metavar} (default: derived from option strings)
|
|
|
|
Stand-in for the option argument(s) to use when printing help text.
|
|
See section~\ref{optparse-tutorial}, the tutorial for an example.
|
|
|
|
\end{itemize}
|
|
|
|
|
|
\subsubsection{Standard option types\label{optparse-standard-option-types}}
|
|
|
|
\module{optparse} has six built-in option types: \code{string}, \code{int}, \code{long},
|
|
\code{choice}, \code{float} and \code{complex}. If you need to add new option
|
|
types, see section~\ref{optparse-extending-optparse}, Extending \module{optparse}.
|
|
|
|
Arguments to string options are not checked or converted in any way: the
|
|
text on the command line is stored in the destination (or passed to the
|
|
callback) as-is.
|
|
|
|
Integer arguments (type \code{int} or \code{long}) are parsed as follows:
|
|
\begin{quote}
|
|
\begin{itemize}
|
|
\item {}
|
|
if the number starts with \code{0x}, it is parsed as a hexadecimal number
|
|
|
|
\item {}
|
|
if the number starts with \code{0}, it is parsed as an octal number
|
|
|
|
\item {}
|
|
if the number starts with \code{0b}, is is parsed as a binary number
|
|
|
|
\item {}
|
|
otherwise, the number is parsed as a decimal number
|
|
|
|
\end{itemize}
|
|
\end{quote}
|
|
|
|
The conversion is done by calling either \code{int()} or \code{long()} with
|
|
the appropriate base (2, 8, 10, or 16). If this fails, so will \module{optparse},
|
|
although with a more useful error message.
|
|
|
|
\code{float} and \code{complex} option arguments are converted directly with
|
|
\code{float()} and \code{complex()}, with similar error-handling.
|
|
|
|
\code{choice} options are a subtype of \code{string} options. The \code{choices}
|
|
option attribute (a sequence of strings) defines the set of allowed
|
|
option arguments. \code{optparse.check{\_}choice()} compares
|
|
user-supplied option arguments against this master list and raises
|
|
OptionValueError if an invalid string is given.
|
|
|
|
|
|
\subsubsection{Parsing arguments\label{optparse-parsing-arguments}}
|
|
|
|
The whole point of creating and populating an OptionParser is to call
|
|
its \method{parse{\_}args()} method:
|
|
\begin{verbatim}
|
|
(options, args) = parser.parse_args(args=None, options=None)
|
|
\end{verbatim}
|
|
|
|
where the input parameters are
|
|
\begin{description}
|
|
\item[\code{args}]
|
|
the list of arguments to process (default: \code{sys.argv{[}1:]})
|
|
\item[\code{options}]
|
|
object to store option arguments in (default: a new instance of
|
|
optparse.Values)
|
|
\end{description}
|
|
|
|
and the return values are
|
|
\begin{description}
|
|
\item[\code{options}]
|
|
the same object that was passed in as \code{options}, or the
|
|
optparse.Values instance created by \module{optparse}
|
|
\item[\code{args}]
|
|
the leftover positional arguments after all options have been
|
|
processed
|
|
\end{description}
|
|
|
|
The most common usage is to supply neither keyword argument. If you
|
|
supply \code{options}, it will be modified with repeated \code{setattr()}
|
|
calls (roughly one for every option argument stored to an option
|
|
destination) and returned by \method{parse{\_}args()}.
|
|
|
|
If \method{parse{\_}args()} encounters any errors in the argument list, it calls
|
|
the OptionParser's \method{error()} method with an appropriate end-user error
|
|
message. This ultimately terminates your process with an exit status of
|
|
2 (the traditional \UNIX{} exit status for command-line errors).
|
|
|
|
|
|
\subsubsection{Querying and manipulating your option parser\label{optparse-querying-manipulating-option-parser}}
|
|
|
|
Sometimes, it's useful to poke around your option parser and see what's
|
|
there. OptionParser provides a couple of methods to help you out:
|
|
\begin{description}
|
|
\item[\code{has{\_}option(opt{\_}str)}]
|
|
Return true if the OptionParser has an option with
|
|
option string \code{opt{\_}str} (e.g., \code{"-q"} or \code{"-{}-verbose"}).
|
|
\item[\code{get{\_}option(opt{\_}str)}]
|
|
Returns the Option instance with the option string \code{opt{\_}str}, or
|
|
\code{None} if no options have that option string.
|
|
\item[\code{remove{\_}option(opt{\_}str)}]
|
|
If the OptionParser has an option corresponding to \code{opt{\_}str},
|
|
that option is removed. If that option provided any other
|
|
option strings, all of those option strings become invalid.
|
|
If \code{opt{\_}str} does not occur in any option belonging to this
|
|
OptionParser, raises ValueError.
|
|
\end{description}
|
|
|
|
|
|
\subsubsection{Conflicts between options\label{optparse-conflicts-between-options}}
|
|
|
|
If you're not careful, it's easy to define options with conflicting
|
|
option strings:
|
|
\begin{verbatim}
|
|
parser.add_option("-n", "--dry-run", ...)
|
|
[...]
|
|
parser.add_option("-n", "--noisy", ...)
|
|
\end{verbatim}
|
|
|
|
(This is particularly true if you've defined your own OptionParser
|
|
subclass with some standard options.)
|
|
|
|
Every time you add an option, \module{optparse} checks for conflicts with existing
|
|
options. If it finds any, it invokes the current conflict-handling
|
|
mechanism. You can set the conflict-handling mechanism either in the
|
|
constructor:
|
|
\begin{verbatim}
|
|
parser = OptionParser(..., conflict_handler=handler)
|
|
\end{verbatim}
|
|
|
|
or with a separate call:
|
|
\begin{verbatim}
|
|
parser.set_conflict_handler(handler)
|
|
\end{verbatim}
|
|
|
|
The available conflict handlers are:
|
|
\begin{quote}
|
|
\begin{description}
|
|
\item[\code{error} (default)]
|
|
assume option conflicts are a programming error and raise
|
|
OptionConflictError
|
|
\item[\code{resolve}]
|
|
resolve option conflicts intelligently (see below)
|
|
\end{description}
|
|
\end{quote}
|
|
|
|
As an example, let's define an OptionParser that resolves conflicts
|
|
intelligently and add conflicting options to it:
|
|
\begin{verbatim}
|
|
parser = OptionParser(conflict_handler="resolve")
|
|
parser.add_option("-n", "--dry-run", ..., help="do no harm")
|
|
parser.add_option("-n", "--noisy", ..., help="be noisy")
|
|
\end{verbatim}
|
|
|
|
At this point, \module{optparse} detects that a previously-added option is already
|
|
using the \code{"-n"} option string. Since \code{conflict{\_}handler} is
|
|
\code{"resolve"}, it resolves the situation by removing \code{"-n"} from the
|
|
earlier option's list of option strings. Now \code{"-{}-dry-run"} is the
|
|
only way for the user to activate that option. If the user asks for
|
|
help, the help message will reflect that:
|
|
\begin{verbatim}
|
|
options:
|
|
--dry-run do no harm
|
|
[...]
|
|
-n, --noisy be noisy
|
|
\end{verbatim}
|
|
|
|
It's possible to whittle away the option strings for a previously-added
|
|
option until there are none left, and the user has no way of invoking
|
|
that option from the command-line. In that case, \module{optparse} removes that
|
|
option completely, so it doesn't show up in help text or anywhere else.
|
|
Carrying on with our existing OptionParser:
|
|
\begin{verbatim}
|
|
parser.add_option("--dry-run", ..., help="new dry-run option")
|
|
\end{verbatim}
|
|
|
|
At this point, the original \programopt{-n/-{}-dry-run} option is no longer
|
|
accessible, so \module{optparse} removes it, leaving this help text:
|
|
\begin{verbatim}
|
|
options:
|
|
[...]
|
|
-n, --noisy be noisy
|
|
--dry-run new dry-run option
|
|
\end{verbatim}
|
|
|
|
|
|
\subsubsection{Cleanup\label{optparse-cleanup}}
|
|
|
|
OptionParser instances have several cyclic references. This should not
|
|
be a problem for Python's garbage collector, but you may wish to break
|
|
the cyclic references explicitly by calling \code{destroy()} on your
|
|
OptionParser once you are done with it. This is particularly useful in
|
|
long-running applications where large object graphs are reachable from
|
|
your OptionParser.
|
|
|
|
|
|
\subsubsection{Other methods\label{optparse-other-methods}}
|
|
|
|
OptionParser supports several other public methods:
|
|
\begin{itemize}
|
|
\item {}
|
|
\code{set{\_}usage(usage)}
|
|
|
|
Set the usage string according to the rules described above for the
|
|
\code{usage} constructor keyword argument. Passing \code{None} sets the
|
|
default usage string; use \code{SUPPRESS{\_}USAGE} to suppress a usage
|
|
message.
|
|
|
|
\item {}
|
|
\code{enable{\_}interspersed{\_}args()}, \code{disable{\_}interspersed{\_}args()}
|
|
|
|
Enable/disable positional arguments interspersed with options, similar
|
|
to GNU getopt (enabled by default). For example, if \code{"-a"} and
|
|
\code{"-b"} are both simple options that take no arguments, \module{optparse}
|
|
normally accepts this syntax:
|
|
\begin{verbatim}
|
|
prog -a arg1 -b arg2
|
|
\end{verbatim}
|
|
|
|
and treats it as equivalent to
|
|
\begin{verbatim}
|
|
prog -a -b arg1 arg2
|
|
\end{verbatim}
|
|
|
|
To disable this feature, call \code{disable{\_}interspersed{\_}args()}. This
|
|
restores traditional \UNIX{} syntax, where option parsing stops with the
|
|
first non-option argument.
|
|
|
|
\item {}
|
|
\code{set{\_}defaults(dest=value, ...)}
|
|
|
|
Set default values for several option destinations at once. Using
|
|
\method{set{\_}defaults()} is the preferred way to set default values for
|
|
options, since multiple options can share the same destination. For
|
|
example, if several ``mode'' options all set the same destination, any
|
|
one of them can set the default, and the last one wins:
|
|
\begin{verbatim}
|
|
parser.add_option("--advanced", action="store_const",
|
|
dest="mode", const="advanced",
|
|
default="novice") # overridden below
|
|
parser.add_option("--novice", action="store_const",
|
|
dest="mode", const="novice",
|
|
default="advanced") # overrides above setting
|
|
\end{verbatim}
|
|
|
|
To avoid this confusion, use \method{set{\_}defaults()}:
|
|
\begin{verbatim}
|
|
parser.set_defaults(mode="advanced")
|
|
parser.add_option("--advanced", action="store_const",
|
|
dest="mode", const="advanced")
|
|
parser.add_option("--novice", action="store_const",
|
|
dest="mode", const="novice")
|
|
\end{verbatim}
|
|
|
|
\end{itemize}
|
|
% $Id: reference.txt 519 2006-06-11 14:39:11Z gward $
|
|
|
|
|
|
\subsection{Option Callbacks\label{optparse-option-callbacks}}
|
|
|
|
When \module{optparse}'s built-in actions and types aren't quite enough for your
|
|
needs, you have two choices: extend \module{optparse} or define a callback option.
|
|
Extending \module{optparse} is more general, but overkill for a lot of simple
|
|
cases. Quite often a simple callback is all you need.
|
|
|
|
There are two steps to defining a callback option:
|
|
\begin{itemize}
|
|
\item {}
|
|
define the option itself using the \code{callback} action
|
|
|
|
\item {}
|
|
write the callback; this is a function (or method) that
|
|
takes at least four arguments, as described below
|
|
|
|
\end{itemize}
|
|
|
|
|
|
\subsubsection{Defining a callback option\label{optparse-defining-callback-option}}
|
|
|
|
As always, the easiest way to define a callback option is by using the
|
|
\code{parser.add{\_}option()} method. Apart from \member{action}, the only option
|
|
attribute you must specify is \code{callback}, the function to call:
|
|
\begin{verbatim}
|
|
parser.add_option("-c", action="callback", callback=my_callback)
|
|
\end{verbatim}
|
|
|
|
\code{callback} is a function (or other callable object), so you must have
|
|
already defined \code{my{\_}callback()} when you create this callback option.
|
|
In this simple case, \module{optparse} doesn't even know if \programopt{-c} takes any
|
|
arguments, which usually means that the option takes no arguments{---}the
|
|
mere presence of \programopt{-c} on the command-line is all it needs to know. In
|
|
some circumstances, though, you might want your callback to consume an
|
|
arbitrary number of command-line arguments. This is where writing
|
|
callbacks gets tricky; it's covered later in this section.
|
|
|
|
\module{optparse} always passes four particular arguments to your callback, and it
|
|
will only pass additional arguments if you specify them via
|
|
\code{callback{\_}args} and \code{callback{\_}kwargs}. Thus, the minimal callback
|
|
function signature is:
|
|
\begin{verbatim}
|
|
def my_callback(option, opt, value, parser):
|
|
\end{verbatim}
|
|
|
|
The four arguments to a callback are described below.
|
|
|
|
There are several other option attributes that you can supply when you
|
|
define a callback option:
|
|
\begin{description}
|
|
\item[\member{type}]
|
|
has its usual meaning: as with the \code{store} or \code{append} actions,
|
|
it instructs \module{optparse} to consume one argument and convert it to
|
|
\member{type}. Rather than storing the converted value(s) anywhere,
|
|
though, \module{optparse} passes it to your callback function.
|
|
\item[\code{nargs}]
|
|
also has its usual meaning: if it is supplied and {\textgreater} 1, \module{optparse} will
|
|
consume \code{nargs} arguments, each of which must be convertible to
|
|
\member{type}. It then passes a tuple of converted values to your
|
|
callback.
|
|
\item[\code{callback{\_}args}]
|
|
a tuple of extra positional arguments to pass to the callback
|
|
\item[\code{callback{\_}kwargs}]
|
|
a dictionary of extra keyword arguments to pass to the callback
|
|
\end{description}
|
|
|
|
|
|
\subsubsection{How callbacks are called\label{optparse-how-callbacks-called}}
|
|
|
|
All callbacks are called as follows:
|
|
\begin{verbatim}
|
|
func(option, opt_str, value, parser, *args, **kwargs)
|
|
\end{verbatim}
|
|
|
|
where
|
|
\begin{description}
|
|
\item[\code{option}]
|
|
is the Option instance that's calling the callback
|
|
\item[\code{opt{\_}str}]
|
|
is the option string seen on the command-line that's triggering the
|
|
callback. (If an abbreviated long option was used, \code{opt{\_}str} will
|
|
be the full, canonical option string{---}e.g. if the user puts
|
|
\code{"-{}-foo"} on the command-line as an abbreviation for
|
|
\code{"-{}-foobar"}, then \code{opt{\_}str} will be \code{"-{}-foobar"}.)
|
|
\item[\code{value}]
|
|
is the argument to this option seen on the command-line. \module{optparse} will
|
|
only expect an argument if \member{type} is set; the type of \code{value}
|
|
will be the type implied by the option's type. If \member{type} for this
|
|
option is \code{None} (no argument expected), then \code{value} will be
|
|
\code{None}. If \code{nargs} {\textgreater} 1, \code{value} will be a tuple of values of
|
|
the appropriate type.
|
|
\item[\code{parser}]
|
|
is the OptionParser instance driving the whole thing, mainly
|
|
useful because you can access some other interesting data through
|
|
its instance attributes:
|
|
\begin{description}
|
|
\item[\code{parser.largs}]
|
|
the current list of leftover arguments, ie. arguments that have
|
|
been consumed but are neither options nor option arguments.
|
|
Feel free to modify \code{parser.largs}, e.g. by adding more
|
|
arguments to it. (This list will become \code{args}, the second
|
|
return value of \method{parse{\_}args()}.)
|
|
\item[\code{parser.rargs}]
|
|
the current list of remaining arguments, ie. with \code{opt{\_}str} and
|
|
\code{value} (if applicable) removed, and only the arguments
|
|
following them still there. Feel free to modify
|
|
\code{parser.rargs}, e.g. by consuming more arguments.
|
|
\item[\code{parser.values}]
|
|
the object where option values are by default stored (an
|
|
instance of optparse.OptionValues). This lets callbacks use the
|
|
same mechanism as the rest of \module{optparse} for storing option values;
|
|
you don't need to mess around with globals or closures. You can
|
|
also access or modify the value(s) of any options already
|
|
encountered on the command-line.
|
|
\end{description}
|
|
\item[\code{args}]
|
|
is a tuple of arbitrary positional arguments supplied via the
|
|
\code{callback{\_}args} option attribute.
|
|
\item[\code{kwargs}]
|
|
is a dictionary of arbitrary keyword arguments supplied via
|
|
\code{callback{\_}kwargs}.
|
|
\end{description}
|
|
|
|
|
|
\subsubsection{Raising errors in a callback\label{optparse-raising-errors-in-callback}}
|
|
|
|
The callback function should raise OptionValueError if there are any
|
|
problems with the option or its argument(s). \module{optparse} catches this and
|
|
terminates the program, printing the error message you supply to
|
|
stderr. Your message should be clear, concise, accurate, and mention
|
|
the option at fault. Otherwise, the user will have a hard time
|
|
figuring out what he did wrong.
|
|
|
|
|
|
\subsubsection{Callback example 1: trivial callback\label{optparse-callback-example-1}}
|
|
|
|
Here's an example of a callback option that takes no arguments, and
|
|
simply records that the option was seen:
|
|
\begin{verbatim}
|
|
def record_foo_seen(option, opt_str, value, parser):
|
|
parser.saw_foo = True
|
|
|
|
parser.add_option("--foo", action="callback", callback=record_foo_seen)
|
|
\end{verbatim}
|
|
|
|
Of course, you could do that with the \code{store{\_}true} action.
|
|
|
|
|
|
\subsubsection{Callback example 2: check option order\label{optparse-callback-example-2}}
|
|
|
|
Here's a slightly more interesting example: record the fact that
|
|
\code{"-a"} is seen, but blow up if it comes after \code{"-b"} in the
|
|
command-line.
|
|
\begin{verbatim}
|
|
def check_order(option, opt_str, value, parser):
|
|
if parser.values.b:
|
|
raise OptionValueError("can't use -a after -b")
|
|
parser.values.a = 1
|
|
[...]
|
|
parser.add_option("-a", action="callback", callback=check_order)
|
|
parser.add_option("-b", action="store_true", dest="b")
|
|
\end{verbatim}
|
|
|
|
|
|
\subsubsection{Callback example 3: check option order (generalized)\label{optparse-callback-example-3}}
|
|
|
|
If you want to re-use this callback for several similar options (set a
|
|
flag, but blow up if \code{"-b"} has already been seen), it needs a bit of
|
|
work: the error message and the flag that it sets must be
|
|
generalized.
|
|
\begin{verbatim}
|
|
def check_order(option, opt_str, value, parser):
|
|
if parser.values.b:
|
|
raise OptionValueError("can't use %s after -b" % opt_str)
|
|
setattr(parser.values, option.dest, 1)
|
|
[...]
|
|
parser.add_option("-a", action="callback", callback=check_order, dest='a')
|
|
parser.add_option("-b", action="store_true", dest="b")
|
|
parser.add_option("-c", action="callback", callback=check_order, dest='c')
|
|
\end{verbatim}
|
|
|
|
|
|
\subsubsection{Callback example 4: check arbitrary condition\label{optparse-callback-example-4}}
|
|
|
|
Of course, you could put any condition in there{---}you're not limited
|
|
to checking the values of already-defined options. For example, if
|
|
you have options that should not be called when the moon is full, all
|
|
you have to do is this:
|
|
\begin{verbatim}
|
|
def check_moon(option, opt_str, value, parser):
|
|
if is_moon_full():
|
|
raise OptionValueError("%s option invalid when moon is full"
|
|
% opt_str)
|
|
setattr(parser.values, option.dest, 1)
|
|
[...]
|
|
parser.add_option("--foo",
|
|
action="callback", callback=check_moon, dest="foo")
|
|
\end{verbatim}
|
|
|
|
(The definition of \code{is{\_}moon{\_}full()} is left as an exercise for the
|
|
reader.)
|
|
|
|
|
|
\subsubsection{Callback example 5: fixed arguments\label{optparse-callback-example-5}}
|
|
|
|
Things get slightly more interesting when you define callback options
|
|
that take a fixed number of arguments. Specifying that a callback
|
|
option takes arguments is similar to defining a \code{store} or \code{append}
|
|
option: if you define \member{type}, then the option takes one argument that
|
|
must be convertible to that type; if you further define \code{nargs}, then
|
|
the option takes \code{nargs} arguments.
|
|
|
|
Here's an example that just emulates the standard \code{store} action:
|
|
\begin{verbatim}
|
|
def store_value(option, opt_str, value, parser):
|
|
setattr(parser.values, option.dest, value)
|
|
[...]
|
|
parser.add_option("--foo",
|
|
action="callback", callback=store_value,
|
|
type="int", nargs=3, dest="foo")
|
|
\end{verbatim}
|
|
|
|
Note that \module{optparse} takes care of consuming 3 arguments and converting them
|
|
to integers for you; all you have to do is store them. (Or whatever;
|
|
obviously you don't need a callback for this example.)
|
|
|
|
|
|
\subsubsection{Callback example 6: variable arguments\label{optparse-callback-example-6}}
|
|
|
|
Things get hairy when you want an option to take a variable number of
|
|
arguments. For this case, you must write a callback, as \module{optparse} doesn't
|
|
provide any built-in capabilities for it. And you have to deal with
|
|
certain intricacies of conventional \UNIX{} command-line parsing that \module{optparse}
|
|
normally handles for you. In particular, callbacks should implement
|
|
the conventional rules for bare \code{"-{}-"} and \code{"-"} arguments:
|
|
\begin{itemize}
|
|
\item {}
|
|
either \code{"-{}-"} or \code{"-"} can be option arguments
|
|
|
|
\item {}
|
|
bare \code{"-{}-"} (if not the argument to some option): halt command-line
|
|
processing and discard the \code{"-{}-"}
|
|
|
|
\item {}
|
|
bare \code{"-"} (if not the argument to some option): halt command-line
|
|
processing but keep the \code{"-"} (append it to \code{parser.largs})
|
|
|
|
\end{itemize}
|
|
|
|
If you want an option that takes a variable number of arguments, there
|
|
are several subtle, tricky issues to worry about. The exact
|
|
implementation you choose will be based on which trade-offs you're
|
|
willing to make for your application (which is why \module{optparse} doesn't support
|
|
this sort of thing directly).
|
|
|
|
Nevertheless, here's a stab at a callback for an option with variable
|
|
arguments:
|
|
\begin{verbatim}
|
|
def vararg_callback(option, opt_str, value, parser):
|
|
assert value is None
|
|
done = 0
|
|
value = []
|
|
rargs = parser.rargs
|
|
while rargs:
|
|
arg = rargs[0]
|
|
|
|
# Stop if we hit an arg like "--foo", "-a", "-fx", "--file=f",
|
|
# etc. Note that this also stops on "-3" or "-3.0", so if
|
|
# your option takes numeric values, you will need to handle
|
|
# this.
|
|
if ((arg[:2] == "--" and len(arg) > 2) or
|
|
(arg[:1] == "-" and len(arg) > 1 and arg[1] != "-")):
|
|
break
|
|
else:
|
|
value.append(arg)
|
|
del rargs[0]
|
|
|
|
setattr(parser.values, option.dest, value)
|
|
|
|
[...]
|
|
parser.add_option("-c", "--callback",
|
|
action="callback", callback=varargs)
|
|
\end{verbatim}
|
|
|
|
The main weakness with this particular implementation is that negative
|
|
numbers in the arguments following \code{"-c"} will be interpreted as
|
|
further options (probably causing an error), rather than as arguments to
|
|
\code{"-c"}. Fixing this is left as an exercise for the reader.
|
|
% $Id: callbacks.txt 415 2004-09-30 02:26:17Z greg $
|
|
|
|
|
|
\subsection{Extending \module{optparse}\label{optparse-extending-optparse}}
|
|
|
|
Since the two major controlling factors in how \module{optparse} interprets
|
|
command-line options are the action and type of each option, the most
|
|
likely direction of extension is to add new actions and new types.
|
|
|
|
|
|
\subsubsection{Adding new types\label{optparse-adding-new-types}}
|
|
|
|
To add new types, you need to define your own subclass of \module{optparse}'s Option
|
|
class. This class has a couple of attributes that define \module{optparse}'s types:
|
|
\member{TYPES} and \member{TYPE{\_}CHECKER}.
|
|
|
|
\member{TYPES} is a tuple of type names; in your subclass, simply define a new
|
|
tuple \member{TYPES} that builds on the standard one.
|
|
|
|
\member{TYPE{\_}CHECKER} is a dictionary mapping type names to type-checking
|
|
functions. A type-checking function has the following signature:
|
|
\begin{verbatim}
|
|
def check_mytype(option, opt, value)
|
|
\end{verbatim}
|
|
|
|
where \code{option} is an \class{Option} instance, \code{opt} is an option string
|
|
(e.g., \code{"-f"}), and \code{value} is the string from the command line that
|
|
must be checked and converted to your desired type. \code{check{\_}mytype()}
|
|
should return an object of the hypothetical type \code{mytype}. The value
|
|
returned by a type-checking function will wind up in the OptionValues
|
|
instance returned by \method{OptionParser.parse{\_}args()}, or be passed to a
|
|
callback as the \code{value} parameter.
|
|
|
|
Your type-checking function should raise OptionValueError if it
|
|
encounters any problems. OptionValueError takes a single string
|
|
argument, which is passed as-is to OptionParser's \method{error()} method,
|
|
which in turn prepends the program name and the string \code{"error:"} and
|
|
prints everything to stderr before terminating the process.
|
|
|
|
Here's a silly example that demonstrates adding a \code{complex} option
|
|
type to parse Python-style complex numbers on the command line. (This
|
|
is even sillier than it used to be, because \module{optparse} 1.3 added built-in
|
|
support for complex numbers, but never mind.)
|
|
|
|
First, the necessary imports:
|
|
\begin{verbatim}
|
|
from copy import copy
|
|
from optparse import Option, OptionValueError
|
|
\end{verbatim}
|
|
|
|
You need to define your type-checker first, since it's referred to later
|
|
(in the \member{TYPE{\_}CHECKER} class attribute of your Option subclass):
|
|
\begin{verbatim}
|
|
def check_complex(option, opt, value):
|
|
try:
|
|
return complex(value)
|
|
except ValueError:
|
|
raise OptionValueError(
|
|
"option %s: invalid complex value: %r" % (opt, value))
|
|
\end{verbatim}
|
|
|
|
Finally, the Option subclass:
|
|
\begin{verbatim}
|
|
class MyOption (Option):
|
|
TYPES = Option.TYPES + ("complex",)
|
|
TYPE_CHECKER = copy(Option.TYPE_CHECKER)
|
|
TYPE_CHECKER["complex"] = check_complex
|
|
\end{verbatim}
|
|
|
|
(If we didn't make a \function{copy()} of \member{Option.TYPE{\_}CHECKER}, we would end
|
|
up modifying the \member{TYPE{\_}CHECKER} attribute of \module{optparse}'s Option class.
|
|
This being Python, nothing stops you from doing that except good manners
|
|
and common sense.)
|
|
|
|
That's it! Now you can write a script that uses the new option type
|
|
just like any other \module{optparse}-based script, except you have to instruct your
|
|
OptionParser to use MyOption instead of Option:
|
|
\begin{verbatim}
|
|
parser = OptionParser(option_class=MyOption)
|
|
parser.add_option("-c", type="complex")
|
|
\end{verbatim}
|
|
|
|
Alternately, you can build your own option list and pass it to
|
|
OptionParser; if you don't use \method{add{\_}option()} in the above way, you
|
|
don't need to tell OptionParser which option class to use:
|
|
\begin{verbatim}
|
|
option_list = [MyOption("-c", action="store", type="complex", dest="c")]
|
|
parser = OptionParser(option_list=option_list)
|
|
\end{verbatim}
|
|
|
|
|
|
\subsubsection{Adding new actions\label{optparse-adding-new-actions}}
|
|
|
|
Adding new actions is a bit trickier, because you have to understand
|
|
that \module{optparse} has a couple of classifications for actions:
|
|
\begin{description}
|
|
\item[``store'' actions]
|
|
actions that result in \module{optparse} storing a value to an attribute of the
|
|
current OptionValues instance; these options require a \member{dest}
|
|
attribute to be supplied to the Option constructor
|
|
\item[``typed'' actions]
|
|
actions that take a value from the command line and expect it to be
|
|
of a certain type; or rather, a string that can be converted to a
|
|
certain type. These options require a \member{type} attribute to the
|
|
Option constructor.
|
|
\end{description}
|
|
|
|
These are overlapping sets: some default ``store'' actions are \code{store},
|
|
\code{store{\_}const}, \code{append}, and \code{count}, while the default ``typed''
|
|
actions are \code{store}, \code{append}, and \code{callback}.
|
|
|
|
When you add an action, you need to categorize it by listing it in at
|
|
least one of the following class attributes of Option (all are lists of
|
|
strings):
|
|
\begin{description}
|
|
\item[\member{ACTIONS}]
|
|
all actions must be listed in ACTIONS
|
|
\item[\member{STORE{\_}ACTIONS}]
|
|
``store'' actions are additionally listed here
|
|
\item[\member{TYPED{\_}ACTIONS}]
|
|
``typed'' actions are additionally listed here
|
|
\item[\code{ALWAYS{\_}TYPED{\_}ACTIONS}]
|
|
actions that always take a type (i.e. whose options always take a
|
|
value) are additionally listed here. The only effect of this is
|
|
that \module{optparse} assigns the default type, \code{string}, to options with no
|
|
explicit type whose action is listed in \code{ALWAYS{\_}TYPED{\_}ACTIONS}.
|
|
\end{description}
|
|
|
|
In order to actually implement your new action, you must override
|
|
Option's \method{take{\_}action()} method and add a case that recognizes your
|
|
action.
|
|
|
|
For example, let's add an \code{extend} action. This is similar to the
|
|
standard \code{append} action, but instead of taking a single value from
|
|
the command-line and appending it to an existing list, \code{extend} will
|
|
take multiple values in a single comma-delimited string, and extend an
|
|
existing list with them. That is, if \code{"-{}-names"} is an \code{extend}
|
|
option of type \code{string}, the command line
|
|
\begin{verbatim}
|
|
--names=foo,bar --names blah --names ding,dong
|
|
\end{verbatim}
|
|
|
|
would result in a list
|
|
\begin{verbatim}
|
|
["foo", "bar", "blah", "ding", "dong"]
|
|
\end{verbatim}
|
|
|
|
Again we define a subclass of Option:
|
|
\begin{verbatim}
|
|
class MyOption (Option):
|
|
|
|
ACTIONS = Option.ACTIONS + ("extend",)
|
|
STORE_ACTIONS = Option.STORE_ACTIONS + ("extend",)
|
|
TYPED_ACTIONS = Option.TYPED_ACTIONS + ("extend",)
|
|
ALWAYS_TYPED_ACTIONS = Option.ALWAYS_TYPED_ACTIONS + ("extend",)
|
|
|
|
def take_action(self, action, dest, opt, value, values, parser):
|
|
if action == "extend":
|
|
lvalue = value.split(",")
|
|
values.ensure_value(dest, []).extend(lvalue)
|
|
else:
|
|
Option.take_action(
|
|
self, action, dest, opt, value, values, parser)
|
|
\end{verbatim}
|
|
|
|
Features of note:
|
|
\begin{itemize}
|
|
\item {}
|
|
\code{extend} both expects a value on the command-line and stores that
|
|
value somewhere, so it goes in both \member{STORE{\_}ACTIONS} and
|
|
\member{TYPED{\_}ACTIONS}
|
|
|
|
\item {}
|
|
to ensure that \module{optparse} assigns the default type of \code{string} to
|
|
\code{extend} actions, we put the \code{extend} action in
|
|
\code{ALWAYS{\_}TYPED{\_}ACTIONS} as well
|
|
|
|
\item {}
|
|
\method{MyOption.take{\_}action()} implements just this one new action, and
|
|
passes control back to \method{Option.take{\_}action()} for the standard
|
|
\module{optparse} actions
|
|
|
|
\item {}
|
|
\code{values} is an instance of the optparse{\_}parser.Values class,
|
|
which provides the very useful \method{ensure{\_}value()} method.
|
|
\method{ensure{\_}value()} is essentially \function{getattr()} with a safety valve;
|
|
it is called as
|
|
\begin{verbatim}
|
|
values.ensure_value(attr, value)
|
|
\end{verbatim}
|
|
|
|
If the \code{attr} attribute of \code{values} doesn't exist or is None, then
|
|
ensure{\_}value() first sets it to \code{value}, and then returns 'value.
|
|
This is very handy for actions like \code{extend}, \code{append}, and
|
|
\code{count}, all of which accumulate data in a variable and expect that
|
|
variable to be of a certain type (a list for the first two, an integer
|
|
for the latter). Using \method{ensure{\_}value()} means that scripts using
|
|
your action don't have to worry about setting a default value for the
|
|
option destinations in question; they can just leave the default as
|
|
None and \method{ensure{\_}value()} will take care of getting it right when
|
|
it's needed.
|
|
|
|
\end{itemize}
|
|
% $Id: extending.txt 517 2006-06-10 16:18:11Z gward $
|
|
|