mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +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. ........
1638 lines
61 KiB
Python
1638 lines
61 KiB
Python
#!/usr/bin/python
|
|
|
|
#
|
|
# Test suite for Optik. Supplied by Johannes Gijsbers
|
|
# (taradino@softhome.net) -- translated from the original Optik
|
|
# test suite to this PyUnit-based version.
|
|
#
|
|
# $Id$
|
|
#
|
|
|
|
import sys
|
|
import os
|
|
import re
|
|
import copy
|
|
import types
|
|
import unittest
|
|
|
|
from StringIO import StringIO
|
|
from pprint import pprint
|
|
from test import test_support
|
|
|
|
|
|
from optparse import make_option, Option, IndentedHelpFormatter, \
|
|
TitledHelpFormatter, OptionParser, OptionContainer, OptionGroup, \
|
|
SUPPRESS_HELP, SUPPRESS_USAGE, OptionError, OptionConflictError, \
|
|
BadOptionError, OptionValueError, Values
|
|
from optparse import _match_abbrev
|
|
from optparse import _parse_num
|
|
|
|
# Do the right thing with boolean values for all known Python versions.
|
|
try:
|
|
True, False
|
|
except NameError:
|
|
(True, False) = (1, 0)
|
|
|
|
retype = type(re.compile(''))
|
|
|
|
class InterceptedError(Exception):
|
|
def __init__(self,
|
|
error_message=None,
|
|
exit_status=None,
|
|
exit_message=None):
|
|
self.error_message = error_message
|
|
self.exit_status = exit_status
|
|
self.exit_message = exit_message
|
|
|
|
def __str__(self):
|
|
return self.error_message or self.exit_message or "intercepted error"
|
|
|
|
class InterceptingOptionParser(OptionParser):
|
|
def exit(self, status=0, msg=None):
|
|
raise InterceptedError(exit_status=status, exit_message=msg)
|
|
|
|
def error(self, msg):
|
|
raise InterceptedError(error_message=msg)
|
|
|
|
|
|
class BaseTest(unittest.TestCase):
|
|
def assertParseOK(self, args, expected_opts, expected_positional_args):
|
|
"""Assert the options are what we expected when parsing arguments.
|
|
|
|
Otherwise, fail with a nicely formatted message.
|
|
|
|
Keyword arguments:
|
|
args -- A list of arguments to parse with OptionParser.
|
|
expected_opts -- The options expected.
|
|
expected_positional_args -- The positional arguments expected.
|
|
|
|
Returns the options and positional args for further testing.
|
|
"""
|
|
|
|
(options, positional_args) = self.parser.parse_args(args)
|
|
optdict = vars(options)
|
|
|
|
self.assertEqual(optdict, expected_opts,
|
|
"""
|
|
Options are %(optdict)s.
|
|
Should be %(expected_opts)s.
|
|
Args were %(args)s.""" % locals())
|
|
|
|
self.assertEqual(positional_args, expected_positional_args,
|
|
"""
|
|
Positional arguments are %(positional_args)s.
|
|
Should be %(expected_positional_args)s.
|
|
Args were %(args)s.""" % locals ())
|
|
|
|
return (options, positional_args)
|
|
|
|
def assertRaises(self,
|
|
func,
|
|
args,
|
|
kwargs,
|
|
expected_exception,
|
|
expected_message):
|
|
"""
|
|
Assert that the expected exception is raised when calling a
|
|
function, and that the right error message is included with
|
|
that exception.
|
|
|
|
Arguments:
|
|
func -- the function to call
|
|
args -- positional arguments to `func`
|
|
kwargs -- keyword arguments to `func`
|
|
expected_exception -- exception that should be raised
|
|
expected_message -- expected exception message (or pattern
|
|
if a compiled regex object)
|
|
|
|
Returns the exception raised for further testing.
|
|
"""
|
|
if args is None:
|
|
args = ()
|
|
if kwargs is None:
|
|
kwargs = {}
|
|
|
|
try:
|
|
func(*args, **kwargs)
|
|
except expected_exception as err:
|
|
actual_message = str(err)
|
|
if isinstance(expected_message, retype):
|
|
self.assert_(expected_message.search(actual_message),
|
|
"""\
|
|
expected exception message pattern:
|
|
/%s/
|
|
actual exception message:
|
|
'''%s'''
|
|
""" % (expected_message.pattern, actual_message))
|
|
else:
|
|
self.assertEqual(actual_message,
|
|
expected_message,
|
|
"""\
|
|
expected exception message:
|
|
'''%s'''
|
|
actual exception message:
|
|
'''%s'''
|
|
""" % (expected_message, actual_message))
|
|
|
|
return err
|
|
else:
|
|
self.fail("""expected exception %(expected_exception)s not raised
|
|
called %(func)r
|
|
with args %(args)r
|
|
and kwargs %(kwargs)r
|
|
""" % locals ())
|
|
|
|
|
|
# -- Assertions used in more than one class --------------------
|
|
|
|
def assertParseFail(self, cmdline_args, expected_output):
|
|
"""
|
|
Assert the parser fails with the expected message. Caller
|
|
must ensure that self.parser is an InterceptingOptionParser.
|
|
"""
|
|
try:
|
|
self.parser.parse_args(cmdline_args)
|
|
except InterceptedError as err:
|
|
self.assertEqual(err.error_message, expected_output)
|
|
else:
|
|
self.assertFalse("expected parse failure")
|
|
|
|
def assertOutput(self,
|
|
cmdline_args,
|
|
expected_output,
|
|
expected_status=0,
|
|
expected_error=None):
|
|
"""Assert the parser prints the expected output on stdout."""
|
|
save_stdout = sys.stdout
|
|
encoding = getattr(save_stdout, 'encoding', None)
|
|
try:
|
|
try:
|
|
sys.stdout = StringIO()
|
|
if encoding:
|
|
sys.stdout.encoding = encoding
|
|
self.parser.parse_args(cmdline_args)
|
|
finally:
|
|
output = sys.stdout.getvalue()
|
|
sys.stdout = save_stdout
|
|
|
|
except InterceptedError as err:
|
|
self.assert_(
|
|
type(output) is types.StringType,
|
|
"expected output to be an ordinary string, not %r"
|
|
% type(output))
|
|
|
|
if output != expected_output:
|
|
self.fail("expected: \n'''\n" + expected_output +
|
|
"'''\nbut got \n'''\n" + output + "'''")
|
|
self.assertEqual(err.exit_status, expected_status)
|
|
self.assertEqual(err.exit_message, expected_error)
|
|
else:
|
|
self.assertFalse("expected parser.exit()")
|
|
|
|
def assertTypeError(self, func, expected_message, *args):
|
|
"""Assert that TypeError is raised when executing func."""
|
|
self.assertRaises(func, args, None, TypeError, expected_message)
|
|
|
|
def assertHelp(self, parser, expected_help):
|
|
actual_help = parser.format_help()
|
|
if actual_help != expected_help:
|
|
raise self.failureException(
|
|
'help text failure; expected:\n"' +
|
|
expected_help + '"; got:\n"' +
|
|
actual_help + '"\n')
|
|
|
|
# -- Test make_option() aka Option -------------------------------------
|
|
|
|
# It's not necessary to test correct options here. All the tests in the
|
|
# parser.parse_args() section deal with those, because they're needed
|
|
# there.
|
|
|
|
class TestOptionChecks(BaseTest):
|
|
def setUp(self):
|
|
self.parser = OptionParser(usage=SUPPRESS_USAGE)
|
|
|
|
def assertOptionError(self, expected_message, args=[], kwargs={}):
|
|
self.assertRaises(make_option, args, kwargs,
|
|
OptionError, expected_message)
|
|
|
|
def test_opt_string_empty(self):
|
|
self.assertTypeError(make_option,
|
|
"at least one option string must be supplied")
|
|
|
|
def test_opt_string_too_short(self):
|
|
self.assertOptionError(
|
|
"invalid option string 'b': must be at least two characters long",
|
|
["b"])
|
|
|
|
def test_opt_string_short_invalid(self):
|
|
self.assertOptionError(
|
|
"invalid short option string '--': must be "
|
|
"of the form -x, (x any non-dash char)",
|
|
["--"])
|
|
|
|
def test_opt_string_long_invalid(self):
|
|
self.assertOptionError(
|
|
"invalid long option string '---': "
|
|
"must start with --, followed by non-dash",
|
|
["---"])
|
|
|
|
def test_attr_invalid(self):
|
|
self.assertOptionError(
|
|
"option -b: invalid keyword arguments: bar, foo",
|
|
["-b"], {'foo': None, 'bar': None})
|
|
|
|
def test_action_invalid(self):
|
|
self.assertOptionError(
|
|
"option -b: invalid action: 'foo'",
|
|
["-b"], {'action': 'foo'})
|
|
|
|
def test_type_invalid(self):
|
|
self.assertOptionError(
|
|
"option -b: invalid option type: 'foo'",
|
|
["-b"], {'type': 'foo'})
|
|
self.assertOptionError(
|
|
"option -b: invalid option type: 'tuple'",
|
|
["-b"], {'type': tuple})
|
|
|
|
def test_no_type_for_action(self):
|
|
self.assertOptionError(
|
|
"option -b: must not supply a type for action 'count'",
|
|
["-b"], {'action': 'count', 'type': 'int'})
|
|
|
|
def test_no_choices_list(self):
|
|
self.assertOptionError(
|
|
"option -b/--bad: must supply a list of "
|
|
"choices for type 'choice'",
|
|
["-b", "--bad"], {'type': "choice"})
|
|
|
|
def test_bad_choices_list(self):
|
|
typename = type('').__name__
|
|
self.assertOptionError(
|
|
"option -b/--bad: choices must be a list of "
|
|
"strings ('%s' supplied)" % typename,
|
|
["-b", "--bad"],
|
|
{'type': "choice", 'choices':"bad choices"})
|
|
|
|
def test_no_choices_for_type(self):
|
|
self.assertOptionError(
|
|
"option -b: must not supply choices for type 'int'",
|
|
["-b"], {'type': 'int', 'choices':"bad"})
|
|
|
|
def test_no_const_for_action(self):
|
|
self.assertOptionError(
|
|
"option -b: 'const' must not be supplied for action 'store'",
|
|
["-b"], {'action': 'store', 'const': 1})
|
|
|
|
def test_no_nargs_for_action(self):
|
|
self.assertOptionError(
|
|
"option -b: 'nargs' must not be supplied for action 'count'",
|
|
["-b"], {'action': 'count', 'nargs': 2})
|
|
|
|
def test_callback_not_callable(self):
|
|
self.assertOptionError(
|
|
"option -b: callback not callable: 'foo'",
|
|
["-b"], {'action': 'callback',
|
|
'callback': 'foo'})
|
|
|
|
def dummy(self):
|
|
pass
|
|
|
|
def test_callback_args_no_tuple(self):
|
|
self.assertOptionError(
|
|
"option -b: callback_args, if supplied, "
|
|
"must be a tuple: not 'foo'",
|
|
["-b"], {'action': 'callback',
|
|
'callback': self.dummy,
|
|
'callback_args': 'foo'})
|
|
|
|
def test_callback_kwargs_no_dict(self):
|
|
self.assertOptionError(
|
|
"option -b: callback_kwargs, if supplied, "
|
|
"must be a dict: not 'foo'",
|
|
["-b"], {'action': 'callback',
|
|
'callback': self.dummy,
|
|
'callback_kwargs': 'foo'})
|
|
|
|
def test_no_callback_for_action(self):
|
|
self.assertOptionError(
|
|
"option -b: callback supplied ('foo') for non-callback option",
|
|
["-b"], {'action': 'store',
|
|
'callback': 'foo'})
|
|
|
|
def test_no_callback_args_for_action(self):
|
|
self.assertOptionError(
|
|
"option -b: callback_args supplied for non-callback option",
|
|
["-b"], {'action': 'store',
|
|
'callback_args': 'foo'})
|
|
|
|
def test_no_callback_kwargs_for_action(self):
|
|
self.assertOptionError(
|
|
"option -b: callback_kwargs supplied for non-callback option",
|
|
["-b"], {'action': 'store',
|
|
'callback_kwargs': 'foo'})
|
|
|
|
class TestOptionParser(BaseTest):
|
|
def setUp(self):
|
|
self.parser = OptionParser()
|
|
self.parser.add_option("-v", "--verbose", "-n", "--noisy",
|
|
action="store_true", dest="verbose")
|
|
self.parser.add_option("-q", "--quiet", "--silent",
|
|
action="store_false", dest="verbose")
|
|
|
|
def test_add_option_no_Option(self):
|
|
self.assertTypeError(self.parser.add_option,
|
|
"not an Option instance: None", None)
|
|
|
|
def test_add_option_invalid_arguments(self):
|
|
self.assertTypeError(self.parser.add_option,
|
|
"invalid arguments", None, None)
|
|
|
|
def test_get_option(self):
|
|
opt1 = self.parser.get_option("-v")
|
|
self.assert_(isinstance(opt1, Option))
|
|
self.assertEqual(opt1._short_opts, ["-v", "-n"])
|
|
self.assertEqual(opt1._long_opts, ["--verbose", "--noisy"])
|
|
self.assertEqual(opt1.action, "store_true")
|
|
self.assertEqual(opt1.dest, "verbose")
|
|
|
|
def test_get_option_equals(self):
|
|
opt1 = self.parser.get_option("-v")
|
|
opt2 = self.parser.get_option("--verbose")
|
|
opt3 = self.parser.get_option("-n")
|
|
opt4 = self.parser.get_option("--noisy")
|
|
self.assert_(opt1 is opt2 is opt3 is opt4)
|
|
|
|
def test_has_option(self):
|
|
self.assert_(self.parser.has_option("-v"))
|
|
self.assert_(self.parser.has_option("--verbose"))
|
|
|
|
def assert_removed(self):
|
|
self.assert_(self.parser.get_option("-v") is None)
|
|
self.assert_(self.parser.get_option("--verbose") is None)
|
|
self.assert_(self.parser.get_option("-n") is None)
|
|
self.assert_(self.parser.get_option("--noisy") is None)
|
|
|
|
self.failIf(self.parser.has_option("-v"))
|
|
self.failIf(self.parser.has_option("--verbose"))
|
|
self.failIf(self.parser.has_option("-n"))
|
|
self.failIf(self.parser.has_option("--noisy"))
|
|
|
|
self.assert_(self.parser.has_option("-q"))
|
|
self.assert_(self.parser.has_option("--silent"))
|
|
|
|
def test_remove_short_opt(self):
|
|
self.parser.remove_option("-n")
|
|
self.assert_removed()
|
|
|
|
def test_remove_long_opt(self):
|
|
self.parser.remove_option("--verbose")
|
|
self.assert_removed()
|
|
|
|
def test_remove_nonexistent(self):
|
|
self.assertRaises(self.parser.remove_option, ('foo',), None,
|
|
ValueError, "no such option 'foo'")
|
|
|
|
def test_refleak(self):
|
|
# If an OptionParser is carrying around a reference to a large
|
|
# object, various cycles can prevent it from being GC'd in
|
|
# a timely fashion. destroy() breaks the cycles to ensure stuff
|
|
# can be cleaned up.
|
|
big_thing = [42]
|
|
refcount = sys.getrefcount(big_thing)
|
|
parser = OptionParser()
|
|
parser.add_option("-a", "--aaarggh")
|
|
parser.big_thing = big_thing
|
|
|
|
parser.destroy()
|
|
#self.assertEqual(refcount, sys.getrefcount(big_thing))
|
|
del parser
|
|
self.assertEqual(refcount, sys.getrefcount(big_thing))
|
|
|
|
|
|
class TestOptionValues(BaseTest):
|
|
def setUp(self):
|
|
pass
|
|
|
|
def test_basics(self):
|
|
values = Values()
|
|
self.assertEqual(vars(values), {})
|
|
self.assertEqual(values, {})
|
|
self.assertNotEqual(values, {"foo": "bar"})
|
|
self.assertNotEqual(values, "")
|
|
|
|
dict = {"foo": "bar", "baz": 42}
|
|
values = Values(defaults=dict)
|
|
self.assertEqual(vars(values), dict)
|
|
self.assertEqual(values, dict)
|
|
self.assertNotEqual(values, {"foo": "bar"})
|
|
self.assertNotEqual(values, {})
|
|
self.assertNotEqual(values, "")
|
|
self.assertNotEqual(values, [])
|
|
|
|
|
|
class TestTypeAliases(BaseTest):
|
|
def setUp(self):
|
|
self.parser = OptionParser()
|
|
|
|
def test_str_aliases_string(self):
|
|
self.parser.add_option("-s", type="str")
|
|
self.assertEquals(self.parser.get_option("-s").type, "string")
|
|
|
|
def test_new_type_object(self):
|
|
self.parser.add_option("-s", type=str)
|
|
self.assertEquals(self.parser.get_option("-s").type, "string")
|
|
self.parser.add_option("-x", type=int)
|
|
self.assertEquals(self.parser.get_option("-x").type, "int")
|
|
|
|
def test_old_type_object(self):
|
|
self.parser.add_option("-s", type=types.StringType)
|
|
self.assertEquals(self.parser.get_option("-s").type, "string")
|
|
self.parser.add_option("-x", type=types.IntType)
|
|
self.assertEquals(self.parser.get_option("-x").type, "int")
|
|
|
|
|
|
# Custom type for testing processing of default values.
|
|
_time_units = { 's' : 1, 'm' : 60, 'h' : 60*60, 'd' : 60*60*24 }
|
|
|
|
def _check_duration(option, opt, value):
|
|
try:
|
|
if value[-1].isdigit():
|
|
return int(value)
|
|
else:
|
|
return int(value[:-1]) * _time_units[value[-1]]
|
|
except ValueError as IndexError:
|
|
raise OptionValueError(
|
|
'option %s: invalid duration: %r' % (opt, value))
|
|
|
|
class DurationOption(Option):
|
|
TYPES = Option.TYPES + ('duration',)
|
|
TYPE_CHECKER = copy.copy(Option.TYPE_CHECKER)
|
|
TYPE_CHECKER['duration'] = _check_duration
|
|
|
|
class TestDefaultValues(BaseTest):
|
|
def setUp(self):
|
|
self.parser = OptionParser()
|
|
self.parser.add_option("-v", "--verbose", default=True)
|
|
self.parser.add_option("-q", "--quiet", dest='verbose')
|
|
self.parser.add_option("-n", type="int", default=37)
|
|
self.parser.add_option("-m", type="int")
|
|
self.parser.add_option("-s", default="foo")
|
|
self.parser.add_option("-t")
|
|
self.parser.add_option("-u", default=None)
|
|
self.expected = { 'verbose': True,
|
|
'n': 37,
|
|
'm': None,
|
|
's': "foo",
|
|
't': None,
|
|
'u': None }
|
|
|
|
def test_basic_defaults(self):
|
|
self.assertEqual(self.parser.get_default_values(), self.expected)
|
|
|
|
def test_mixed_defaults_post(self):
|
|
self.parser.set_defaults(n=42, m=-100)
|
|
self.expected.update({'n': 42, 'm': -100})
|
|
self.assertEqual(self.parser.get_default_values(), self.expected)
|
|
|
|
def test_mixed_defaults_pre(self):
|
|
self.parser.set_defaults(x="barf", y="blah")
|
|
self.parser.add_option("-x", default="frob")
|
|
self.parser.add_option("-y")
|
|
|
|
self.expected.update({'x': "frob", 'y': "blah"})
|
|
self.assertEqual(self.parser.get_default_values(), self.expected)
|
|
|
|
self.parser.remove_option("-y")
|
|
self.parser.add_option("-y", default=None)
|
|
self.expected.update({'y': None})
|
|
self.assertEqual(self.parser.get_default_values(), self.expected)
|
|
|
|
def test_process_default(self):
|
|
self.parser.option_class = DurationOption
|
|
self.parser.add_option("-d", type="duration", default=300)
|
|
self.parser.add_option("-e", type="duration", default="6m")
|
|
self.parser.set_defaults(n="42")
|
|
self.expected.update({'d': 300, 'e': 360, 'n': 42})
|
|
self.assertEqual(self.parser.get_default_values(), self.expected)
|
|
|
|
self.parser.set_process_default_values(False)
|
|
self.expected.update({'d': 300, 'e': "6m", 'n': "42"})
|
|
self.assertEqual(self.parser.get_default_values(), self.expected)
|
|
|
|
|
|
class TestProgName(BaseTest):
|
|
"""
|
|
Test that %prog expands to the right thing in usage, version,
|
|
and help strings.
|
|
"""
|
|
|
|
def assertUsage(self, parser, expected_usage):
|
|
self.assertEqual(parser.get_usage(), expected_usage)
|
|
|
|
def assertVersion(self, parser, expected_version):
|
|
self.assertEqual(parser.get_version(), expected_version)
|
|
|
|
|
|
def test_default_progname(self):
|
|
# Make sure that program name taken from sys.argv[0] by default.
|
|
save_argv = sys.argv[:]
|
|
try:
|
|
sys.argv[0] = os.path.join("foo", "bar", "baz.py")
|
|
parser = OptionParser("%prog ...", version="%prog 1.2")
|
|
expected_usage = "Usage: baz.py ...\n"
|
|
self.assertUsage(parser, expected_usage)
|
|
self.assertVersion(parser, "baz.py 1.2")
|
|
self.assertHelp(parser,
|
|
expected_usage + "\n" +
|
|
"Options:\n"
|
|
" --version show program's version number and exit\n"
|
|
" -h, --help show this help message and exit\n")
|
|
finally:
|
|
sys.argv[:] = save_argv
|
|
|
|
def test_custom_progname(self):
|
|
parser = OptionParser(prog="thingy",
|
|
version="%prog 0.1",
|
|
usage="%prog arg arg")
|
|
parser.remove_option("-h")
|
|
parser.remove_option("--version")
|
|
expected_usage = "Usage: thingy arg arg\n"
|
|
self.assertUsage(parser, expected_usage)
|
|
self.assertVersion(parser, "thingy 0.1")
|
|
self.assertHelp(parser, expected_usage + "\n")
|
|
|
|
|
|
class TestExpandDefaults(BaseTest):
|
|
def setUp(self):
|
|
self.parser = OptionParser(prog="test")
|
|
self.help_prefix = """\
|
|
Usage: test [options]
|
|
|
|
Options:
|
|
-h, --help show this help message and exit
|
|
"""
|
|
self.file_help = "read from FILE [default: %default]"
|
|
self.expected_help_file = self.help_prefix + \
|
|
" -f FILE, --file=FILE read from FILE [default: foo.txt]\n"
|
|
self.expected_help_none = self.help_prefix + \
|
|
" -f FILE, --file=FILE read from FILE [default: none]\n"
|
|
|
|
def test_option_default(self):
|
|
self.parser.add_option("-f", "--file",
|
|
default="foo.txt",
|
|
help=self.file_help)
|
|
self.assertHelp(self.parser, self.expected_help_file)
|
|
|
|
def test_parser_default_1(self):
|
|
self.parser.add_option("-f", "--file",
|
|
help=self.file_help)
|
|
self.parser.set_default('file', "foo.txt")
|
|
self.assertHelp(self.parser, self.expected_help_file)
|
|
|
|
def test_parser_default_2(self):
|
|
self.parser.add_option("-f", "--file",
|
|
help=self.file_help)
|
|
self.parser.set_defaults(file="foo.txt")
|
|
self.assertHelp(self.parser, self.expected_help_file)
|
|
|
|
def test_no_default(self):
|
|
self.parser.add_option("-f", "--file",
|
|
help=self.file_help)
|
|
self.assertHelp(self.parser, self.expected_help_none)
|
|
|
|
def test_default_none_1(self):
|
|
self.parser.add_option("-f", "--file",
|
|
default=None,
|
|
help=self.file_help)
|
|
self.assertHelp(self.parser, self.expected_help_none)
|
|
|
|
def test_default_none_2(self):
|
|
self.parser.add_option("-f", "--file",
|
|
help=self.file_help)
|
|
self.parser.set_defaults(file=None)
|
|
self.assertHelp(self.parser, self.expected_help_none)
|
|
|
|
def test_float_default(self):
|
|
self.parser.add_option(
|
|
"-p", "--prob",
|
|
help="blow up with probability PROB [default: %default]")
|
|
self.parser.set_defaults(prob=0.43)
|
|
expected_help = self.help_prefix + \
|
|
" -p PROB, --prob=PROB blow up with probability PROB [default: 0.43]\n"
|
|
self.assertHelp(self.parser, expected_help)
|
|
|
|
def test_alt_expand(self):
|
|
self.parser.add_option("-f", "--file",
|
|
default="foo.txt",
|
|
help="read from FILE [default: *DEFAULT*]")
|
|
self.parser.formatter.default_tag = "*DEFAULT*"
|
|
self.assertHelp(self.parser, self.expected_help_file)
|
|
|
|
def test_no_expand(self):
|
|
self.parser.add_option("-f", "--file",
|
|
default="foo.txt",
|
|
help="read from %default file")
|
|
self.parser.formatter.default_tag = None
|
|
expected_help = self.help_prefix + \
|
|
" -f FILE, --file=FILE read from %default file\n"
|
|
self.assertHelp(self.parser, expected_help)
|
|
|
|
|
|
# -- Test parser.parse_args() ------------------------------------------
|
|
|
|
class TestStandard(BaseTest):
|
|
def setUp(self):
|
|
options = [make_option("-a", type="string"),
|
|
make_option("-b", "--boo", type="int", dest='boo'),
|
|
make_option("--foo", action="append")]
|
|
|
|
self.parser = InterceptingOptionParser(usage=SUPPRESS_USAGE,
|
|
option_list=options)
|
|
|
|
def test_required_value(self):
|
|
self.assertParseFail(["-a"], "-a option requires an argument")
|
|
|
|
def test_invalid_integer(self):
|
|
self.assertParseFail(["-b", "5x"],
|
|
"option -b: invalid integer value: '5x'")
|
|
|
|
def test_no_such_option(self):
|
|
self.assertParseFail(["--boo13"], "no such option: --boo13")
|
|
|
|
def test_long_invalid_integer(self):
|
|
self.assertParseFail(["--boo=x5"],
|
|
"option --boo: invalid integer value: 'x5'")
|
|
|
|
def test_empty(self):
|
|
self.assertParseOK([], {'a': None, 'boo': None, 'foo': None}, [])
|
|
|
|
def test_shortopt_empty_longopt_append(self):
|
|
self.assertParseOK(["-a", "", "--foo=blah", "--foo="],
|
|
{'a': "", 'boo': None, 'foo': ["blah", ""]},
|
|
[])
|
|
|
|
def test_long_option_append(self):
|
|
self.assertParseOK(["--foo", "bar", "--foo", "", "--foo=x"],
|
|
{'a': None,
|
|
'boo': None,
|
|
'foo': ["bar", "", "x"]},
|
|
[])
|
|
|
|
def test_option_argument_joined(self):
|
|
self.assertParseOK(["-abc"],
|
|
{'a': "bc", 'boo': None, 'foo': None},
|
|
[])
|
|
|
|
def test_option_argument_split(self):
|
|
self.assertParseOK(["-a", "34"],
|
|
{'a': "34", 'boo': None, 'foo': None},
|
|
[])
|
|
|
|
def test_option_argument_joined_integer(self):
|
|
self.assertParseOK(["-b34"],
|
|
{'a': None, 'boo': 34, 'foo': None},
|
|
[])
|
|
|
|
def test_option_argument_split_negative_integer(self):
|
|
self.assertParseOK(["-b", "-5"],
|
|
{'a': None, 'boo': -5, 'foo': None},
|
|
[])
|
|
|
|
def test_long_option_argument_joined(self):
|
|
self.assertParseOK(["--boo=13"],
|
|
{'a': None, 'boo': 13, 'foo': None},
|
|
[])
|
|
|
|
def test_long_option_argument_split(self):
|
|
self.assertParseOK(["--boo", "111"],
|
|
{'a': None, 'boo': 111, 'foo': None},
|
|
[])
|
|
|
|
def test_long_option_short_option(self):
|
|
self.assertParseOK(["--foo=bar", "-axyz"],
|
|
{'a': 'xyz', 'boo': None, 'foo': ["bar"]},
|
|
[])
|
|
|
|
def test_abbrev_long_option(self):
|
|
self.assertParseOK(["--f=bar", "-axyz"],
|
|
{'a': 'xyz', 'boo': None, 'foo': ["bar"]},
|
|
[])
|
|
|
|
def test_defaults(self):
|
|
(options, args) = self.parser.parse_args([])
|
|
defaults = self.parser.get_default_values()
|
|
self.assertEqual(vars(defaults), vars(options))
|
|
|
|
def test_ambiguous_option(self):
|
|
self.parser.add_option("--foz", action="store",
|
|
type="string", dest="foo")
|
|
self.assertParseFail(["--f=bar"],
|
|
"ambiguous option: --f (--foo, --foz?)")
|
|
|
|
|
|
def test_short_and_long_option_split(self):
|
|
self.assertParseOK(["-a", "xyz", "--foo", "bar"],
|
|
{'a': 'xyz', 'boo': None, 'foo': ["bar"]},
|
|
[]),
|
|
|
|
def test_short_option_split_long_option_append(self):
|
|
self.assertParseOK(["--foo=bar", "-b", "123", "--foo", "baz"],
|
|
{'a': None, 'boo': 123, 'foo': ["bar", "baz"]},
|
|
[])
|
|
|
|
def test_short_option_split_one_positional_arg(self):
|
|
self.assertParseOK(["-a", "foo", "bar"],
|
|
{'a': "foo", 'boo': None, 'foo': None},
|
|
["bar"]),
|
|
|
|
def test_short_option_consumes_separator(self):
|
|
self.assertParseOK(["-a", "--", "foo", "bar"],
|
|
{'a': "--", 'boo': None, 'foo': None},
|
|
["foo", "bar"]),
|
|
self.assertParseOK(["-a", "--", "--foo", "bar"],
|
|
{'a': "--", 'boo': None, 'foo': ["bar"]},
|
|
[]),
|
|
|
|
def test_short_option_joined_and_separator(self):
|
|
self.assertParseOK(["-ab", "--", "--foo", "bar"],
|
|
{'a': "b", 'boo': None, 'foo': None},
|
|
["--foo", "bar"]),
|
|
|
|
def test_hyphen_becomes_positional_arg(self):
|
|
self.assertParseOK(["-ab", "-", "--foo", "bar"],
|
|
{'a': "b", 'boo': None, 'foo': ["bar"]},
|
|
["-"])
|
|
|
|
def test_no_append_versus_append(self):
|
|
self.assertParseOK(["-b3", "-b", "5", "--foo=bar", "--foo", "baz"],
|
|
{'a': None, 'boo': 5, 'foo': ["bar", "baz"]},
|
|
[])
|
|
|
|
def test_option_consumes_optionlike_string(self):
|
|
self.assertParseOK(["-a", "-b3"],
|
|
{'a': "-b3", 'boo': None, 'foo': None},
|
|
[])
|
|
|
|
class TestBool(BaseTest):
|
|
def setUp(self):
|
|
options = [make_option("-v",
|
|
"--verbose",
|
|
action="store_true",
|
|
dest="verbose",
|
|
default=''),
|
|
make_option("-q",
|
|
"--quiet",
|
|
action="store_false",
|
|
dest="verbose")]
|
|
self.parser = OptionParser(option_list = options)
|
|
|
|
def test_bool_default(self):
|
|
self.assertParseOK([],
|
|
{'verbose': ''},
|
|
[])
|
|
|
|
def test_bool_false(self):
|
|
(options, args) = self.assertParseOK(["-q"],
|
|
{'verbose': 0},
|
|
[])
|
|
if hasattr(__builtins__, 'False'):
|
|
self.failUnless(options.verbose is False)
|
|
|
|
def test_bool_true(self):
|
|
(options, args) = self.assertParseOK(["-v"],
|
|
{'verbose': 1},
|
|
[])
|
|
if hasattr(__builtins__, 'True'):
|
|
self.failUnless(options.verbose is True)
|
|
|
|
def test_bool_flicker_on_and_off(self):
|
|
self.assertParseOK(["-qvq", "-q", "-v"],
|
|
{'verbose': 1},
|
|
[])
|
|
|
|
class TestChoice(BaseTest):
|
|
def setUp(self):
|
|
self.parser = InterceptingOptionParser(usage=SUPPRESS_USAGE)
|
|
self.parser.add_option("-c", action="store", type="choice",
|
|
dest="choice", choices=["one", "two", "three"])
|
|
|
|
def test_valid_choice(self):
|
|
self.assertParseOK(["-c", "one", "xyz"],
|
|
{'choice': 'one'},
|
|
["xyz"])
|
|
|
|
def test_invalid_choice(self):
|
|
self.assertParseFail(["-c", "four", "abc"],
|
|
"option -c: invalid choice: 'four' "
|
|
"(choose from 'one', 'two', 'three')")
|
|
|
|
def test_add_choice_option(self):
|
|
self.parser.add_option("-d", "--default",
|
|
choices=["four", "five", "six"])
|
|
opt = self.parser.get_option("-d")
|
|
self.assertEqual(opt.type, "choice")
|
|
self.assertEqual(opt.action, "store")
|
|
|
|
class TestCount(BaseTest):
|
|
def setUp(self):
|
|
self.parser = InterceptingOptionParser(usage=SUPPRESS_USAGE)
|
|
self.v_opt = make_option("-v", action="count", dest="verbose")
|
|
self.parser.add_option(self.v_opt)
|
|
self.parser.add_option("--verbose", type="int", dest="verbose")
|
|
self.parser.add_option("-q", "--quiet",
|
|
action="store_const", dest="verbose", const=0)
|
|
|
|
def test_empty(self):
|
|
self.assertParseOK([], {'verbose': None}, [])
|
|
|
|
def test_count_one(self):
|
|
self.assertParseOK(["-v"], {'verbose': 1}, [])
|
|
|
|
def test_count_three(self):
|
|
self.assertParseOK(["-vvv"], {'verbose': 3}, [])
|
|
|
|
def test_count_three_apart(self):
|
|
self.assertParseOK(["-v", "-v", "-v"], {'verbose': 3}, [])
|
|
|
|
def test_count_override_amount(self):
|
|
self.assertParseOK(["-vvv", "--verbose=2"], {'verbose': 2}, [])
|
|
|
|
def test_count_override_quiet(self):
|
|
self.assertParseOK(["-vvv", "--verbose=2", "-q"], {'verbose': 0}, [])
|
|
|
|
def test_count_overriding(self):
|
|
self.assertParseOK(["-vvv", "--verbose=2", "-q", "-v"],
|
|
{'verbose': 1}, [])
|
|
|
|
def test_count_interspersed_args(self):
|
|
self.assertParseOK(["--quiet", "3", "-v"],
|
|
{'verbose': 1},
|
|
["3"])
|
|
|
|
def test_count_no_interspersed_args(self):
|
|
self.parser.disable_interspersed_args()
|
|
self.assertParseOK(["--quiet", "3", "-v"],
|
|
{'verbose': 0},
|
|
["3", "-v"])
|
|
|
|
def test_count_no_such_option(self):
|
|
self.assertParseFail(["-q3", "-v"], "no such option: -3")
|
|
|
|
def test_count_option_no_value(self):
|
|
self.assertParseFail(["--quiet=3", "-v"],
|
|
"--quiet option does not take a value")
|
|
|
|
def test_count_with_default(self):
|
|
self.parser.set_default('verbose', 0)
|
|
self.assertParseOK([], {'verbose':0}, [])
|
|
|
|
def test_count_overriding_default(self):
|
|
self.parser.set_default('verbose', 0)
|
|
self.assertParseOK(["-vvv", "--verbose=2", "-q", "-v"],
|
|
{'verbose': 1}, [])
|
|
|
|
class TestMultipleArgs(BaseTest):
|
|
def setUp(self):
|
|
self.parser = InterceptingOptionParser(usage=SUPPRESS_USAGE)
|
|
self.parser.add_option("-p", "--point",
|
|
action="store", nargs=3, type="float", dest="point")
|
|
|
|
def test_nargs_with_positional_args(self):
|
|
self.assertParseOK(["foo", "-p", "1", "2.5", "-4.3", "xyz"],
|
|
{'point': (1.0, 2.5, -4.3)},
|
|
["foo", "xyz"])
|
|
|
|
def test_nargs_long_opt(self):
|
|
self.assertParseOK(["--point", "-1", "2.5", "-0", "xyz"],
|
|
{'point': (-1.0, 2.5, -0.0)},
|
|
["xyz"])
|
|
|
|
def test_nargs_invalid_float_value(self):
|
|
self.assertParseFail(["-p", "1.0", "2x", "3.5"],
|
|
"option -p: "
|
|
"invalid floating-point value: '2x'")
|
|
|
|
def test_nargs_required_values(self):
|
|
self.assertParseFail(["--point", "1.0", "3.5"],
|
|
"--point option requires 3 arguments")
|
|
|
|
class TestMultipleArgsAppend(BaseTest):
|
|
def setUp(self):
|
|
self.parser = InterceptingOptionParser(usage=SUPPRESS_USAGE)
|
|
self.parser.add_option("-p", "--point", action="store", nargs=3,
|
|
type="float", dest="point")
|
|
self.parser.add_option("-f", "--foo", action="append", nargs=2,
|
|
type="int", dest="foo")
|
|
self.parser.add_option("-z", "--zero", action="append_const",
|
|
dest="foo", const=(0, 0))
|
|
|
|
def test_nargs_append(self):
|
|
self.assertParseOK(["-f", "4", "-3", "blah", "--foo", "1", "666"],
|
|
{'point': None, 'foo': [(4, -3), (1, 666)]},
|
|
["blah"])
|
|
|
|
def test_nargs_append_required_values(self):
|
|
self.assertParseFail(["-f4,3"],
|
|
"-f option requires 2 arguments")
|
|
|
|
def test_nargs_append_simple(self):
|
|
self.assertParseOK(["--foo=3", "4"],
|
|
{'point': None, 'foo':[(3, 4)]},
|
|
[])
|
|
|
|
def test_nargs_append_const(self):
|
|
self.assertParseOK(["--zero", "--foo", "3", "4", "-z"],
|
|
{'point': None, 'foo':[(0, 0), (3, 4), (0, 0)]},
|
|
[])
|
|
|
|
class TestVersion(BaseTest):
|
|
def test_version(self):
|
|
self.parser = InterceptingOptionParser(usage=SUPPRESS_USAGE,
|
|
version="%prog 0.1")
|
|
save_argv = sys.argv[:]
|
|
try:
|
|
sys.argv[0] = os.path.join(os.curdir, "foo", "bar")
|
|
self.assertOutput(["--version"], "bar 0.1\n")
|
|
finally:
|
|
sys.argv[:] = save_argv
|
|
|
|
def test_no_version(self):
|
|
self.parser = InterceptingOptionParser(usage=SUPPRESS_USAGE)
|
|
self.assertParseFail(["--version"],
|
|
"no such option: --version")
|
|
|
|
# -- Test conflicting default values and parser.parse_args() -----------
|
|
|
|
class TestConflictingDefaults(BaseTest):
|
|
"""Conflicting default values: the last one should win."""
|
|
def setUp(self):
|
|
self.parser = OptionParser(option_list=[
|
|
make_option("-v", action="store_true", dest="verbose", default=1)])
|
|
|
|
def test_conflict_default(self):
|
|
self.parser.add_option("-q", action="store_false", dest="verbose",
|
|
default=0)
|
|
self.assertParseOK([], {'verbose': 0}, [])
|
|
|
|
def test_conflict_default_none(self):
|
|
self.parser.add_option("-q", action="store_false", dest="verbose",
|
|
default=None)
|
|
self.assertParseOK([], {'verbose': None}, [])
|
|
|
|
class TestOptionGroup(BaseTest):
|
|
def setUp(self):
|
|
self.parser = OptionParser(usage=SUPPRESS_USAGE)
|
|
|
|
def test_option_group_create_instance(self):
|
|
group = OptionGroup(self.parser, "Spam")
|
|
self.parser.add_option_group(group)
|
|
group.add_option("--spam", action="store_true",
|
|
help="spam spam spam spam")
|
|
self.assertParseOK(["--spam"], {'spam': 1}, [])
|
|
|
|
def test_add_group_no_group(self):
|
|
self.assertTypeError(self.parser.add_option_group,
|
|
"not an OptionGroup instance: None", None)
|
|
|
|
def test_add_group_invalid_arguments(self):
|
|
self.assertTypeError(self.parser.add_option_group,
|
|
"invalid arguments", None, None)
|
|
|
|
def test_add_group_wrong_parser(self):
|
|
group = OptionGroup(self.parser, "Spam")
|
|
group.parser = OptionParser()
|
|
self.assertRaises(self.parser.add_option_group, (group,), None,
|
|
ValueError, "invalid OptionGroup (wrong parser)")
|
|
|
|
def test_group_manipulate(self):
|
|
group = self.parser.add_option_group("Group 2",
|
|
description="Some more options")
|
|
group.set_title("Bacon")
|
|
group.add_option("--bacon", type="int")
|
|
self.assert_(self.parser.get_option_group("--bacon"), group)
|
|
|
|
# -- Test extending and parser.parse_args() ----------------------------
|
|
|
|
class TestExtendAddTypes(BaseTest):
|
|
def setUp(self):
|
|
self.parser = InterceptingOptionParser(usage=SUPPRESS_USAGE,
|
|
option_class=self.MyOption)
|
|
self.parser.add_option("-a", None, type="string", dest="a")
|
|
self.parser.add_option("-f", "--file", type="file", dest="file")
|
|
|
|
def tearDown(self):
|
|
if os.path.isdir(test_support.TESTFN):
|
|
os.rmdir(test_support.TESTFN)
|
|
elif os.path.isfile(test_support.TESTFN):
|
|
os.unlink(test_support.TESTFN)
|
|
|
|
class MyOption (Option):
|
|
def check_file(option, opt, value):
|
|
if not os.path.exists(value):
|
|
raise OptionValueError("%s: file does not exist" % value)
|
|
elif not os.path.isfile(value):
|
|
raise OptionValueError("%s: not a regular file" % value)
|
|
return value
|
|
|
|
TYPES = Option.TYPES + ("file",)
|
|
TYPE_CHECKER = copy.copy(Option.TYPE_CHECKER)
|
|
TYPE_CHECKER["file"] = check_file
|
|
|
|
def test_filetype_ok(self):
|
|
open(test_support.TESTFN, "w").close()
|
|
self.assertParseOK(["--file", test_support.TESTFN, "-afoo"],
|
|
{'file': test_support.TESTFN, 'a': 'foo'},
|
|
[])
|
|
|
|
def test_filetype_noexist(self):
|
|
self.assertParseFail(["--file", test_support.TESTFN, "-afoo"],
|
|
"%s: file does not exist" %
|
|
test_support.TESTFN)
|
|
|
|
def test_filetype_notfile(self):
|
|
os.mkdir(test_support.TESTFN)
|
|
self.assertParseFail(["--file", test_support.TESTFN, "-afoo"],
|
|
"%s: not a regular file" %
|
|
test_support.TESTFN)
|
|
|
|
|
|
class TestExtendAddActions(BaseTest):
|
|
def setUp(self):
|
|
options = [self.MyOption("-a", "--apple", action="extend",
|
|
type="string", dest="apple")]
|
|
self.parser = OptionParser(option_list=options)
|
|
|
|
class MyOption (Option):
|
|
ACTIONS = Option.ACTIONS + ("extend",)
|
|
STORE_ACTIONS = Option.STORE_ACTIONS + ("extend",)
|
|
TYPED_ACTIONS = Option.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, parser, value,
|
|
values)
|
|
|
|
def test_extend_add_action(self):
|
|
self.assertParseOK(["-afoo,bar", "--apple=blah"],
|
|
{'apple': ["foo", "bar", "blah"]},
|
|
[])
|
|
|
|
def test_extend_add_action_normal(self):
|
|
self.assertParseOK(["-a", "foo", "-abar", "--apple=x,y"],
|
|
{'apple': ["foo", "bar", "x", "y"]},
|
|
[])
|
|
|
|
# -- Test callbacks and parser.parse_args() ----------------------------
|
|
|
|
class TestCallback(BaseTest):
|
|
def setUp(self):
|
|
options = [make_option("-x",
|
|
None,
|
|
action="callback",
|
|
callback=self.process_opt),
|
|
make_option("-f",
|
|
"--file",
|
|
action="callback",
|
|
callback=self.process_opt,
|
|
type="string",
|
|
dest="filename")]
|
|
self.parser = OptionParser(option_list=options)
|
|
|
|
def process_opt(self, option, opt, value, parser_):
|
|
if opt == "-x":
|
|
self.assertEqual(option._short_opts, ["-x"])
|
|
self.assertEqual(option._long_opts, [])
|
|
self.assert_(parser_ is self.parser)
|
|
self.assert_(value is None)
|
|
self.assertEqual(vars(parser_.values), {'filename': None})
|
|
|
|
parser_.values.x = 42
|
|
elif opt == "--file":
|
|
self.assertEqual(option._short_opts, ["-f"])
|
|
self.assertEqual(option._long_opts, ["--file"])
|
|
self.assert_(parser_ is self.parser)
|
|
self.assertEqual(value, "foo")
|
|
self.assertEqual(vars(parser_.values), {'filename': None, 'x': 42})
|
|
|
|
setattr(parser_.values, option.dest, value)
|
|
else:
|
|
self.fail("Unknown option %r in process_opt." % opt)
|
|
|
|
def test_callback(self):
|
|
self.assertParseOK(["-x", "--file=foo"],
|
|
{'filename': "foo", 'x': 42},
|
|
[])
|
|
|
|
def test_callback_help(self):
|
|
# This test was prompted by SF bug #960515 -- the point is
|
|
# not to inspect the help text, just to make sure that
|
|
# format_help() doesn't crash.
|
|
parser = OptionParser(usage=SUPPRESS_USAGE)
|
|
parser.remove_option("-h")
|
|
parser.add_option("-t", "--test", action="callback",
|
|
callback=lambda: None, type="string",
|
|
help="foo")
|
|
|
|
expected_help = ("Options:\n"
|
|
" -t TEST, --test=TEST foo\n")
|
|
self.assertHelp(parser, expected_help)
|
|
|
|
|
|
class TestCallbackExtraArgs(BaseTest):
|
|
def setUp(self):
|
|
options = [make_option("-p", "--point", action="callback",
|
|
callback=self.process_tuple,
|
|
callback_args=(3, int), type="string",
|
|
dest="points", default=[])]
|
|
self.parser = OptionParser(option_list=options)
|
|
|
|
def process_tuple(self, option, opt, value, parser_, len, type):
|
|
self.assertEqual(len, 3)
|
|
self.assert_(type is int)
|
|
|
|
if opt == "-p":
|
|
self.assertEqual(value, "1,2,3")
|
|
elif opt == "--point":
|
|
self.assertEqual(value, "4,5,6")
|
|
|
|
value = tuple(map(type, value.split(",")))
|
|
getattr(parser_.values, option.dest).append(value)
|
|
|
|
def test_callback_extra_args(self):
|
|
self.assertParseOK(["-p1,2,3", "--point", "4,5,6"],
|
|
{'points': [(1,2,3), (4,5,6)]},
|
|
[])
|
|
|
|
class TestCallbackMeddleArgs(BaseTest):
|
|
def setUp(self):
|
|
options = [make_option(str(x), action="callback",
|
|
callback=self.process_n, dest='things')
|
|
for x in range(-1, -6, -1)]
|
|
self.parser = OptionParser(option_list=options)
|
|
|
|
# Callback that meddles in rargs, largs
|
|
def process_n(self, option, opt, value, parser_):
|
|
# option is -3, -5, etc.
|
|
nargs = int(opt[1:])
|
|
rargs = parser_.rargs
|
|
if len(rargs) < nargs:
|
|
self.fail("Expected %d arguments for %s option." % (nargs, opt))
|
|
dest = parser_.values.ensure_value(option.dest, [])
|
|
dest.append(tuple(rargs[0:nargs]))
|
|
parser_.largs.append(nargs)
|
|
del rargs[0:nargs]
|
|
|
|
def test_callback_meddle_args(self):
|
|
self.assertParseOK(["-1", "foo", "-3", "bar", "baz", "qux"],
|
|
{'things': [("foo",), ("bar", "baz", "qux")]},
|
|
[1, 3])
|
|
|
|
def test_callback_meddle_args_separator(self):
|
|
self.assertParseOK(["-2", "foo", "--"],
|
|
{'things': [('foo', '--')]},
|
|
[2])
|
|
|
|
class TestCallbackManyArgs(BaseTest):
|
|
def setUp(self):
|
|
options = [make_option("-a", "--apple", action="callback", nargs=2,
|
|
callback=self.process_many, type="string"),
|
|
make_option("-b", "--bob", action="callback", nargs=3,
|
|
callback=self.process_many, type="int")]
|
|
self.parser = OptionParser(option_list=options)
|
|
|
|
def process_many(self, option, opt, value, parser_):
|
|
if opt == "-a":
|
|
self.assertEqual(value, ("foo", "bar"))
|
|
elif opt == "--apple":
|
|
self.assertEqual(value, ("ding", "dong"))
|
|
elif opt == "-b":
|
|
self.assertEqual(value, (1, 2, 3))
|
|
elif opt == "--bob":
|
|
self.assertEqual(value, (-666, 42, 0))
|
|
|
|
def test_many_args(self):
|
|
self.assertParseOK(["-a", "foo", "bar", "--apple", "ding", "dong",
|
|
"-b", "1", "2", "3", "--bob", "-666", "42",
|
|
"0"],
|
|
{"apple": None, "bob": None},
|
|
[])
|
|
|
|
class TestCallbackCheckAbbrev(BaseTest):
|
|
def setUp(self):
|
|
self.parser = OptionParser()
|
|
self.parser.add_option("--foo-bar", action="callback",
|
|
callback=self.check_abbrev)
|
|
|
|
def check_abbrev(self, option, opt, value, parser):
|
|
self.assertEqual(opt, "--foo-bar")
|
|
|
|
def test_abbrev_callback_expansion(self):
|
|
self.assertParseOK(["--foo"], {}, [])
|
|
|
|
class TestCallbackVarArgs(BaseTest):
|
|
def setUp(self):
|
|
options = [make_option("-a", type="int", nargs=2, dest="a"),
|
|
make_option("-b", action="store_true", dest="b"),
|
|
make_option("-c", "--callback", action="callback",
|
|
callback=self.variable_args, dest="c")]
|
|
self.parser = InterceptingOptionParser(usage=SUPPRESS_USAGE,
|
|
option_list=options)
|
|
|
|
def variable_args(self, option, opt, value, parser):
|
|
self.assert_(value is None)
|
|
done = 0
|
|
value = []
|
|
rargs = parser.rargs
|
|
while rargs:
|
|
arg = rargs[0]
|
|
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)
|
|
|
|
def test_variable_args(self):
|
|
self.assertParseOK(["-a3", "-5", "--callback", "foo", "bar"],
|
|
{'a': (3, -5), 'b': None, 'c': ["foo", "bar"]},
|
|
[])
|
|
|
|
def test_consume_separator_stop_at_option(self):
|
|
self.assertParseOK(["-c", "37", "--", "xxx", "-b", "hello"],
|
|
{'a': None,
|
|
'b': True,
|
|
'c': ["37", "--", "xxx"]},
|
|
["hello"])
|
|
|
|
def test_positional_arg_and_variable_args(self):
|
|
self.assertParseOK(["hello", "-c", "foo", "-", "bar"],
|
|
{'a': None,
|
|
'b': None,
|
|
'c':["foo", "-", "bar"]},
|
|
["hello"])
|
|
|
|
def test_stop_at_option(self):
|
|
self.assertParseOK(["-c", "foo", "-b"],
|
|
{'a': None, 'b': True, 'c': ["foo"]},
|
|
[])
|
|
|
|
def test_stop_at_invalid_option(self):
|
|
self.assertParseFail(["-c", "3", "-5", "-a"], "no such option: -5")
|
|
|
|
|
|
# -- Test conflict handling and parser.parse_args() --------------------
|
|
|
|
class ConflictBase(BaseTest):
|
|
def setUp(self):
|
|
options = [make_option("-v", "--verbose", action="count",
|
|
dest="verbose", help="increment verbosity")]
|
|
self.parser = InterceptingOptionParser(usage=SUPPRESS_USAGE,
|
|
option_list=options)
|
|
|
|
def show_version(self, option, opt, value, parser):
|
|
parser.values.show_version = 1
|
|
|
|
class TestConflict(ConflictBase):
|
|
"""Use the default conflict resolution for Optik 1.2: error."""
|
|
def assert_conflict_error(self, func):
|
|
err = self.assertRaises(
|
|
func, ("-v", "--version"), {'action' : "callback",
|
|
'callback' : self.show_version,
|
|
'help' : "show version"},
|
|
OptionConflictError,
|
|
"option -v/--version: conflicting option string(s): -v")
|
|
|
|
self.assertEqual(err.msg, "conflicting option string(s): -v")
|
|
self.assertEqual(err.option_id, "-v/--version")
|
|
|
|
def test_conflict_error(self):
|
|
self.assert_conflict_error(self.parser.add_option)
|
|
|
|
def test_conflict_error_group(self):
|
|
group = OptionGroup(self.parser, "Group 1")
|
|
self.assert_conflict_error(group.add_option)
|
|
|
|
def test_no_such_conflict_handler(self):
|
|
self.assertRaises(
|
|
self.parser.set_conflict_handler, ('foo',), None,
|
|
ValueError, "invalid conflict_resolution value 'foo'")
|
|
|
|
|
|
class TestConflictResolve(ConflictBase):
|
|
def setUp(self):
|
|
ConflictBase.setUp(self)
|
|
self.parser.set_conflict_handler("resolve")
|
|
self.parser.add_option("-v", "--version", action="callback",
|
|
callback=self.show_version, help="show version")
|
|
|
|
def test_conflict_resolve(self):
|
|
v_opt = self.parser.get_option("-v")
|
|
verbose_opt = self.parser.get_option("--verbose")
|
|
version_opt = self.parser.get_option("--version")
|
|
|
|
self.assert_(v_opt is version_opt)
|
|
self.assert_(v_opt is not verbose_opt)
|
|
self.assertEqual(v_opt._long_opts, ["--version"])
|
|
self.assertEqual(version_opt._short_opts, ["-v"])
|
|
self.assertEqual(version_opt._long_opts, ["--version"])
|
|
self.assertEqual(verbose_opt._short_opts, [])
|
|
self.assertEqual(verbose_opt._long_opts, ["--verbose"])
|
|
|
|
def test_conflict_resolve_help(self):
|
|
self.assertOutput(["-h"], """\
|
|
Options:
|
|
--verbose increment verbosity
|
|
-h, --help show this help message and exit
|
|
-v, --version show version
|
|
""")
|
|
|
|
def test_conflict_resolve_short_opt(self):
|
|
self.assertParseOK(["-v"],
|
|
{'verbose': None, 'show_version': 1},
|
|
[])
|
|
|
|
def test_conflict_resolve_long_opt(self):
|
|
self.assertParseOK(["--verbose"],
|
|
{'verbose': 1},
|
|
[])
|
|
|
|
def test_conflict_resolve_long_opts(self):
|
|
self.assertParseOK(["--verbose", "--version"],
|
|
{'verbose': 1, 'show_version': 1},
|
|
[])
|
|
|
|
class TestConflictOverride(BaseTest):
|
|
def setUp(self):
|
|
self.parser = InterceptingOptionParser(usage=SUPPRESS_USAGE)
|
|
self.parser.set_conflict_handler("resolve")
|
|
self.parser.add_option("-n", "--dry-run",
|
|
action="store_true", dest="dry_run",
|
|
help="don't do anything")
|
|
self.parser.add_option("--dry-run", "-n",
|
|
action="store_const", const=42, dest="dry_run",
|
|
help="dry run mode")
|
|
|
|
def test_conflict_override_opts(self):
|
|
opt = self.parser.get_option("--dry-run")
|
|
self.assertEqual(opt._short_opts, ["-n"])
|
|
self.assertEqual(opt._long_opts, ["--dry-run"])
|
|
|
|
def test_conflict_override_help(self):
|
|
self.assertOutput(["-h"], """\
|
|
Options:
|
|
-h, --help show this help message and exit
|
|
-n, --dry-run dry run mode
|
|
""")
|
|
|
|
def test_conflict_override_args(self):
|
|
self.assertParseOK(["-n"],
|
|
{'dry_run': 42},
|
|
[])
|
|
|
|
# -- Other testing. ----------------------------------------------------
|
|
|
|
_expected_help_basic = """\
|
|
Usage: bar.py [options]
|
|
|
|
Options:
|
|
-a APPLE throw APPLEs at basket
|
|
-b NUM, --boo=NUM shout "boo!" NUM times (in order to frighten away all the
|
|
evil spirits that cause trouble and mayhem)
|
|
--foo=FOO store FOO in the foo list for later fooing
|
|
-h, --help show this help message and exit
|
|
"""
|
|
|
|
_expected_help_long_opts_first = """\
|
|
Usage: bar.py [options]
|
|
|
|
Options:
|
|
-a APPLE throw APPLEs at basket
|
|
--boo=NUM, -b NUM shout "boo!" NUM times (in order to frighten away all the
|
|
evil spirits that cause trouble and mayhem)
|
|
--foo=FOO store FOO in the foo list for later fooing
|
|
--help, -h show this help message and exit
|
|
"""
|
|
|
|
_expected_help_title_formatter = """\
|
|
Usage
|
|
=====
|
|
bar.py [options]
|
|
|
|
Options
|
|
=======
|
|
-a APPLE throw APPLEs at basket
|
|
--boo=NUM, -b NUM shout "boo!" NUM times (in order to frighten away all the
|
|
evil spirits that cause trouble and mayhem)
|
|
--foo=FOO store FOO in the foo list for later fooing
|
|
--help, -h show this help message and exit
|
|
"""
|
|
|
|
_expected_help_short_lines = """\
|
|
Usage: bar.py [options]
|
|
|
|
Options:
|
|
-a APPLE throw APPLEs at basket
|
|
-b NUM, --boo=NUM shout "boo!" NUM times (in order to
|
|
frighten away all the evil spirits
|
|
that cause trouble and mayhem)
|
|
--foo=FOO store FOO in the foo list for later
|
|
fooing
|
|
-h, --help show this help message and exit
|
|
"""
|
|
|
|
class TestHelp(BaseTest):
|
|
def setUp(self):
|
|
self.parser = self.make_parser(80)
|
|
|
|
def make_parser(self, columns):
|
|
options = [
|
|
make_option("-a", type="string", dest='a',
|
|
metavar="APPLE", help="throw APPLEs at basket"),
|
|
make_option("-b", "--boo", type="int", dest='boo',
|
|
metavar="NUM",
|
|
help=
|
|
"shout \"boo!\" NUM times (in order to frighten away "
|
|
"all the evil spirits that cause trouble and mayhem)"),
|
|
make_option("--foo", action="append", type="string", dest='foo',
|
|
help="store FOO in the foo list for later fooing"),
|
|
]
|
|
|
|
# We need to set COLUMNS for the OptionParser constructor, but
|
|
# we must restore its original value -- otherwise, this test
|
|
# screws things up for other tests when it's part of the Python
|
|
# test suite.
|
|
orig_columns = os.environ.get('COLUMNS')
|
|
os.environ['COLUMNS'] = str(columns)
|
|
try:
|
|
return InterceptingOptionParser(option_list=options)
|
|
finally:
|
|
if orig_columns is None:
|
|
del os.environ['COLUMNS']
|
|
else:
|
|
os.environ['COLUMNS'] = orig_columns
|
|
|
|
def assertHelpEquals(self, expected_output):
|
|
if type(expected_output) is types.UnicodeType:
|
|
encoding = self.parser._get_encoding(sys.stdout)
|
|
expected_output = expected_output.encode(encoding, "replace")
|
|
|
|
save_argv = sys.argv[:]
|
|
try:
|
|
# Make optparse believe bar.py is being executed.
|
|
sys.argv[0] = os.path.join("foo", "bar.py")
|
|
self.assertOutput(["-h"], expected_output)
|
|
finally:
|
|
sys.argv[:] = save_argv
|
|
|
|
def test_help(self):
|
|
self.assertHelpEquals(_expected_help_basic)
|
|
|
|
def test_help_old_usage(self):
|
|
self.parser.set_usage("Usage: %prog [options]")
|
|
self.assertHelpEquals(_expected_help_basic)
|
|
|
|
def test_help_long_opts_first(self):
|
|
self.parser.formatter.short_first = 0
|
|
self.assertHelpEquals(_expected_help_long_opts_first)
|
|
|
|
def test_help_title_formatter(self):
|
|
save = os.environ.get("COLUMNS")
|
|
try:
|
|
os.environ["COLUMNS"] = "80"
|
|
self.parser.formatter = TitledHelpFormatter()
|
|
self.assertHelpEquals(_expected_help_title_formatter)
|
|
finally:
|
|
if save is not None:
|
|
os.environ["COLUMNS"] = save
|
|
else:
|
|
del os.environ["COLUMNS"]
|
|
|
|
def test_wrap_columns(self):
|
|
# Ensure that wrapping respects $COLUMNS environment variable.
|
|
# Need to reconstruct the parser, since that's the only time
|
|
# we look at $COLUMNS.
|
|
self.parser = self.make_parser(60)
|
|
self.assertHelpEquals(_expected_help_short_lines)
|
|
|
|
def test_help_unicode(self):
|
|
self.parser = InterceptingOptionParser(usage=SUPPRESS_USAGE)
|
|
self.parser.add_option("-a", action="store_true", help=u"ol\u00E9!")
|
|
expect = u"""\
|
|
Options:
|
|
-h, --help show this help message and exit
|
|
-a ol\u00E9!
|
|
"""
|
|
self.assertHelpEquals(expect)
|
|
|
|
def test_help_unicode_description(self):
|
|
self.parser = InterceptingOptionParser(usage=SUPPRESS_USAGE,
|
|
description=u"ol\u00E9!")
|
|
expect = u"""\
|
|
ol\u00E9!
|
|
|
|
Options:
|
|
-h, --help show this help message and exit
|
|
"""
|
|
self.assertHelpEquals(expect)
|
|
|
|
def test_help_description_groups(self):
|
|
self.parser.set_description(
|
|
"This is the program description for %prog. %prog has "
|
|
"an option group as well as single options.")
|
|
|
|
group = OptionGroup(
|
|
self.parser, "Dangerous Options",
|
|
"Caution: use of these options is at your own risk. "
|
|
"It is believed that some of them bite.")
|
|
group.add_option("-g", action="store_true", help="Group option.")
|
|
self.parser.add_option_group(group)
|
|
|
|
expect = """\
|
|
Usage: bar.py [options]
|
|
|
|
This is the program description for bar.py. bar.py has an option group as
|
|
well as single options.
|
|
|
|
Options:
|
|
-a APPLE throw APPLEs at basket
|
|
-b NUM, --boo=NUM shout "boo!" NUM times (in order to frighten away all the
|
|
evil spirits that cause trouble and mayhem)
|
|
--foo=FOO store FOO in the foo list for later fooing
|
|
-h, --help show this help message and exit
|
|
|
|
Dangerous Options:
|
|
Caution: use of these options is at your own risk. It is believed
|
|
that some of them bite.
|
|
|
|
-g Group option.
|
|
"""
|
|
|
|
self.assertHelpEquals(expect)
|
|
|
|
self.parser.epilog = "Please report bugs to /dev/null."
|
|
self.assertHelpEquals(expect + "\nPlease report bugs to /dev/null.\n")
|
|
|
|
|
|
class TestMatchAbbrev(BaseTest):
|
|
def test_match_abbrev(self):
|
|
self.assertEqual(_match_abbrev("--f",
|
|
{"--foz": None,
|
|
"--foo": None,
|
|
"--fie": None,
|
|
"--f": None}),
|
|
"--f")
|
|
|
|
def test_match_abbrev_error(self):
|
|
s = "--f"
|
|
wordmap = {"--foz": None, "--foo": None, "--fie": None}
|
|
self.assertRaises(
|
|
_match_abbrev, (s, wordmap), None,
|
|
BadOptionError, "ambiguous option: --f (--fie, --foo, --foz?)")
|
|
|
|
|
|
class TestParseNumber(BaseTest):
|
|
def setUp(self):
|
|
self.parser = InterceptingOptionParser()
|
|
self.parser.add_option("-n", type=int)
|
|
self.parser.add_option("-l", type=int)
|
|
|
|
def test_parse_num_fail(self):
|
|
self.assertRaises(
|
|
_parse_num, ("", int), {},
|
|
ValueError,
|
|
re.compile(r"invalid literal for int().*: '?'?"))
|
|
self.assertRaises(
|
|
_parse_num, ("0xOoops", int), {},
|
|
ValueError,
|
|
re.compile(r"invalid literal for int().*: '?0xOoops'?"))
|
|
|
|
def test_parse_num_ok(self):
|
|
self.assertEqual(_parse_num("0", int), 0)
|
|
self.assertEqual(_parse_num("0x10", int), 16)
|
|
self.assertEqual(_parse_num("0XA", int), 10)
|
|
self.assertEqual(_parse_num("010", int), 8)
|
|
self.assertEqual(_parse_num("0b11", int), 3)
|
|
self.assertEqual(_parse_num("0b", int), 0)
|
|
|
|
def test_numeric_options(self):
|
|
self.assertParseOK(["-n", "42", "-l", "0x20"],
|
|
{ "n": 42, "l": 0x20 }, [])
|
|
self.assertParseOK(["-n", "0b0101", "-l010"],
|
|
{ "n": 5, "l": 8 }, [])
|
|
self.assertParseFail(["-n008"],
|
|
"option -n: invalid integer value: '008'")
|
|
self.assertParseFail(["-l0b0123"],
|
|
"option -l: invalid integer value: '0b0123'")
|
|
self.assertParseFail(["-l", "0x12x"],
|
|
"option -l: invalid integer value: '0x12x'")
|
|
|
|
|
|
def test_main():
|
|
test_support.run_unittest(__name__)
|
|
|
|
if __name__ == '__main__':
|
|
test_main()
|