mirror of
https://github.com/python/cpython.git
synced 2025-09-01 14:38:00 +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. ........
1974 lines
75 KiB
TeX
1974 lines
75 KiB
TeX
\section{\module{doctest} ---
|
|
Test interactive Python examples}
|
|
|
|
\declaremodule{standard}{doctest}
|
|
\moduleauthor{Tim Peters}{tim@python.org}
|
|
\sectionauthor{Tim Peters}{tim@python.org}
|
|
\sectionauthor{Moshe Zadka}{moshez@debian.org}
|
|
\sectionauthor{Edward Loper}{edloper@users.sourceforge.net}
|
|
|
|
\modulesynopsis{A framework for verifying interactive Python examples.}
|
|
|
|
The \refmodule{doctest} module searches for pieces of text that look like
|
|
interactive Python sessions, and then executes those sessions to
|
|
verify that they work exactly as shown. There are several common ways to
|
|
use doctest:
|
|
|
|
\begin{itemize}
|
|
\item To check that a module's docstrings are up-to-date by verifying
|
|
that all interactive examples still work as documented.
|
|
\item To perform regression testing by verifying that interactive
|
|
examples from a test file or a test object work as expected.
|
|
\item To write tutorial documentation for a package, liberally
|
|
illustrated with input-output examples. Depending on whether
|
|
the examples or the expository text are emphasized, this has
|
|
the flavor of "literate testing" or "executable documentation".
|
|
\end{itemize}
|
|
|
|
Here's a complete but small example module:
|
|
|
|
\begin{verbatim}
|
|
"""
|
|
This is the "example" module.
|
|
|
|
The example module supplies one function, factorial(). For example,
|
|
|
|
>>> factorial(5)
|
|
120
|
|
"""
|
|
|
|
def factorial(n):
|
|
"""Return the factorial of n, an exact integer >= 0.
|
|
|
|
If the result is small enough to fit in an int, return an int.
|
|
Else return a long.
|
|
|
|
>>> [factorial(n) for n in range(6)]
|
|
[1, 1, 2, 6, 24, 120]
|
|
>>> [factorial(long(n)) for n in range(6)]
|
|
[1, 1, 2, 6, 24, 120]
|
|
>>> factorial(30)
|
|
265252859812191058636308480000000L
|
|
>>> factorial(30L)
|
|
265252859812191058636308480000000L
|
|
>>> factorial(-1)
|
|
Traceback (most recent call last):
|
|
...
|
|
ValueError: n must be >= 0
|
|
|
|
Factorials of floats are OK, but the float must be an exact integer:
|
|
>>> factorial(30.1)
|
|
Traceback (most recent call last):
|
|
...
|
|
ValueError: n must be exact integer
|
|
>>> factorial(30.0)
|
|
265252859812191058636308480000000L
|
|
|
|
It must also not be ridiculously large:
|
|
>>> factorial(1e100)
|
|
Traceback (most recent call last):
|
|
...
|
|
OverflowError: n too large
|
|
"""
|
|
|
|
\end{verbatim}
|
|
% allow LaTeX to break here.
|
|
\begin{verbatim}
|
|
|
|
import math
|
|
if not n >= 0:
|
|
raise ValueError("n must be >= 0")
|
|
if math.floor(n) != n:
|
|
raise ValueError("n must be exact integer")
|
|
if n+1 == n: # catch a value like 1e300
|
|
raise OverflowError("n too large")
|
|
result = 1
|
|
factor = 2
|
|
while factor <= n:
|
|
result *= factor
|
|
factor += 1
|
|
return result
|
|
|
|
def _test():
|
|
import doctest
|
|
doctest.testmod()
|
|
|
|
if __name__ == "__main__":
|
|
_test()
|
|
\end{verbatim}
|
|
|
|
If you run \file{example.py} directly from the command line,
|
|
\refmodule{doctest} works its magic:
|
|
|
|
\begin{verbatim}
|
|
$ python example.py
|
|
$
|
|
\end{verbatim}
|
|
|
|
There's no output! That's normal, and it means all the examples
|
|
worked. Pass \programopt{-v} to the script, and \refmodule{doctest}
|
|
prints a detailed log of what it's trying, and prints a summary at the
|
|
end:
|
|
|
|
\begin{verbatim}
|
|
$ python example.py -v
|
|
Trying:
|
|
factorial(5)
|
|
Expecting:
|
|
120
|
|
ok
|
|
Trying:
|
|
[factorial(n) for n in range(6)]
|
|
Expecting:
|
|
[1, 1, 2, 6, 24, 120]
|
|
ok
|
|
Trying:
|
|
[factorial(long(n)) for n in range(6)]
|
|
Expecting:
|
|
[1, 1, 2, 6, 24, 120]
|
|
ok
|
|
\end{verbatim}
|
|
|
|
And so on, eventually ending with:
|
|
|
|
\begin{verbatim}
|
|
Trying:
|
|
factorial(1e100)
|
|
Expecting:
|
|
Traceback (most recent call last):
|
|
...
|
|
OverflowError: n too large
|
|
ok
|
|
1 items had no tests:
|
|
__main__._test
|
|
2 items passed all tests:
|
|
1 tests in __main__
|
|
8 tests in __main__.factorial
|
|
9 tests in 3 items.
|
|
9 passed and 0 failed.
|
|
Test passed.
|
|
$
|
|
\end{verbatim}
|
|
|
|
That's all you need to know to start making productive use of
|
|
\refmodule{doctest}! Jump in. The following sections provide full
|
|
details. Note that there are many examples of doctests in
|
|
the standard Python test suite and libraries. Especially useful examples
|
|
can be found in the standard test file \file{Lib/test/test_doctest.py}.
|
|
|
|
\subsection{Simple Usage: Checking Examples in
|
|
Docstrings\label{doctest-simple-testmod}}
|
|
|
|
The simplest way to start using doctest (but not necessarily the way
|
|
you'll continue to do it) is to end each module \module{M} with:
|
|
|
|
\begin{verbatim}
|
|
def _test():
|
|
import doctest
|
|
doctest.testmod()
|
|
|
|
if __name__ == "__main__":
|
|
_test()
|
|
\end{verbatim}
|
|
|
|
\refmodule{doctest} then examines docstrings in module \module{M}.
|
|
|
|
Running the module as a script causes the examples in the docstrings
|
|
to get executed and verified:
|
|
|
|
\begin{verbatim}
|
|
python M.py
|
|
\end{verbatim}
|
|
|
|
This won't display anything unless an example fails, in which case the
|
|
failing example(s) and the cause(s) of the failure(s) are printed to stdout,
|
|
and the final line of output is
|
|
\samp{***Test Failed*** \var{N} failures.}, where \var{N} is the
|
|
number of examples that failed.
|
|
|
|
Run it with the \programopt{-v} switch instead:
|
|
|
|
\begin{verbatim}
|
|
python M.py -v
|
|
\end{verbatim}
|
|
|
|
and a detailed report of all examples tried is printed to standard
|
|
output, along with assorted summaries at the end.
|
|
|
|
You can force verbose mode by passing \code{verbose=True} to
|
|
\function{testmod()}, or
|
|
prohibit it by passing \code{verbose=False}. In either of those cases,
|
|
\code{sys.argv} is not examined by \function{testmod()} (so passing
|
|
\programopt{-v} or not has no effect).
|
|
|
|
Since Python 2.6, there is also a command line shortcut for running
|
|
\function{testmod()}. You can instruct the Python interpreter to run
|
|
the doctest module directly from the standard library and pass the module
|
|
name(s) on the command line:
|
|
|
|
\begin{verbatim}
|
|
python -m doctest -v example.py
|
|
\end{verbatim}
|
|
|
|
This will import \file{example.py} as a standalone module and run
|
|
\function{testmod()} on it. Note that this may not work correctly if the
|
|
file is part of a package and imports other submodules from that package.
|
|
|
|
For more information on \function{testmod()}, see
|
|
section~\ref{doctest-basic-api}.
|
|
|
|
\subsection{Simple Usage: Checking Examples in a Text
|
|
File\label{doctest-simple-testfile}}
|
|
|
|
Another simple application of doctest is testing interactive examples
|
|
in a text file. This can be done with the \function{testfile()}
|
|
function:
|
|
|
|
\begin{verbatim}
|
|
import doctest
|
|
doctest.testfile("example.txt")
|
|
\end{verbatim}
|
|
|
|
That short script executes and verifies any interactive Python
|
|
examples contained in the file \file{example.txt}. The file content
|
|
is treated as if it were a single giant docstring; the file doesn't
|
|
need to contain a Python program! For example, perhaps \file{example.txt}
|
|
contains this:
|
|
|
|
\begin{verbatim}
|
|
The ``example`` module
|
|
======================
|
|
|
|
Using ``factorial``
|
|
-------------------
|
|
|
|
This is an example text file in reStructuredText format. First import
|
|
``factorial`` from the ``example`` module:
|
|
|
|
>>> from example import factorial
|
|
|
|
Now use it:
|
|
|
|
>>> factorial(6)
|
|
120
|
|
\end{verbatim}
|
|
|
|
Running \code{doctest.testfile("example.txt")} then finds the error
|
|
in this documentation:
|
|
|
|
\begin{verbatim}
|
|
File "./example.txt", line 14, in example.txt
|
|
Failed example:
|
|
factorial(6)
|
|
Expected:
|
|
120
|
|
Got:
|
|
720
|
|
\end{verbatim}
|
|
|
|
As with \function{testmod()}, \function{testfile()} won't display anything
|
|
unless an example fails. If an example does fail, then the failing
|
|
example(s) and the cause(s) of the failure(s) are printed to stdout, using
|
|
the same format as \function{testmod()}.
|
|
|
|
By default, \function{testfile()} looks for files in the calling
|
|
module's directory. See section~\ref{doctest-basic-api} for a
|
|
description of the optional arguments that can be used to tell it to
|
|
look for files in other locations.
|
|
|
|
Like \function{testmod()}, \function{testfile()}'s verbosity can be
|
|
set with the \programopt{-v} command-line switch or with the optional
|
|
keyword argument \var{verbose}.
|
|
|
|
Since Python 2.6, there is also a command line shortcut for running
|
|
\function{testfile()}. You can instruct the Python interpreter to run
|
|
the doctest module directly from the standard library and pass the file
|
|
name(s) on the command line:
|
|
|
|
\begin{verbatim}
|
|
python -m doctest -v example.txt
|
|
\end{verbatim}
|
|
|
|
Because the file name does not end with \file{.py}, \module{doctest} infers
|
|
that it must be run with \function{testfile()}, not \function{testmod()}.
|
|
|
|
For more information on \function{testfile()}, see
|
|
section~\ref{doctest-basic-api}.
|
|
|
|
\subsection{How It Works\label{doctest-how-it-works}}
|
|
|
|
This section examines in detail how doctest works: which docstrings it
|
|
looks at, how it finds interactive examples, what execution context it
|
|
uses, how it handles exceptions, and how option flags can be used to
|
|
control its behavior. This is the information that you need to know
|
|
to write doctest examples; for information about actually running
|
|
doctest on these examples, see the following sections.
|
|
|
|
\subsubsection{Which Docstrings Are Examined?\label{doctest-which-docstrings}}
|
|
|
|
The module docstring, and all function, class and method docstrings are
|
|
searched. Objects imported into the module are not searched.
|
|
|
|
In addition, if \code{M.__test__} exists and "is true", it must be a
|
|
dict, and each entry maps a (string) name to a function object, class
|
|
object, or string. Function and class object docstrings found from
|
|
\code{M.__test__} are searched, and strings are treated as if they
|
|
were docstrings. In output, a key \code{K} in \code{M.__test__} appears
|
|
with name
|
|
|
|
\begin{verbatim}
|
|
<name of M>.__test__.K
|
|
\end{verbatim}
|
|
|
|
Any classes found are recursively searched similarly, to test docstrings in
|
|
their contained methods and nested classes.
|
|
|
|
\versionchanged[A "private name" concept is deprecated and no longer
|
|
documented]{2.4}
|
|
|
|
\subsubsection{How are Docstring Examples
|
|
Recognized?\label{doctest-finding-examples}}
|
|
|
|
In most cases a copy-and-paste of an interactive console session works
|
|
fine, but doctest isn't trying to do an exact emulation of any specific
|
|
Python shell. All hard tab characters are expanded to spaces, using
|
|
8-column tab stops. If you don't believe tabs should mean that, too
|
|
bad: don't use hard tabs, or write your own \class{DocTestParser}
|
|
class.
|
|
|
|
\versionchanged[Expanding tabs to spaces is new; previous versions
|
|
tried to preserve hard tabs, with confusing results]{2.4}
|
|
|
|
\begin{verbatim}
|
|
>>> # comments are ignored
|
|
>>> x = 12
|
|
>>> x
|
|
12
|
|
>>> if x == 13:
|
|
... print "yes"
|
|
... else:
|
|
... print "no"
|
|
... print "NO"
|
|
... print "NO!!!"
|
|
...
|
|
no
|
|
NO
|
|
NO!!!
|
|
>>>
|
|
\end{verbatim}
|
|
|
|
Any expected output must immediately follow the final
|
|
\code{'>>>~'} or \code{'...~'} line containing the code, and
|
|
the expected output (if any) extends to the next \code{'>>>~'}
|
|
or all-whitespace line.
|
|
|
|
The fine print:
|
|
|
|
\begin{itemize}
|
|
|
|
\item Expected output cannot contain an all-whitespace line, since such a
|
|
line is taken to signal the end of expected output. If expected
|
|
output does contain a blank line, put \code{<BLANKLINE>} in your
|
|
doctest example each place a blank line is expected.
|
|
\versionchanged[\code{<BLANKLINE>} was added; there was no way to
|
|
use expected output containing empty lines in
|
|
previous versions]{2.4}
|
|
|
|
\item Output to stdout is captured, but not output to stderr (exception
|
|
tracebacks are captured via a different means).
|
|
|
|
\item If you continue a line via backslashing in an interactive session,
|
|
or for any other reason use a backslash, you should use a raw
|
|
docstring, which will preserve your backslashes exactly as you type
|
|
them:
|
|
|
|
\begin{verbatim}
|
|
>>> def f(x):
|
|
... r'''Backslashes in a raw docstring: m\n'''
|
|
>>> print f.__doc__
|
|
Backslashes in a raw docstring: m\n
|
|
\end{verbatim}
|
|
|
|
Otherwise, the backslash will be interpreted as part of the string.
|
|
For example, the "{\textbackslash}" above would be interpreted as a
|
|
newline character. Alternatively, you can double each backslash in the
|
|
doctest version (and not use a raw string):
|
|
|
|
\begin{verbatim}
|
|
>>> def f(x):
|
|
... '''Backslashes in a raw docstring: m\\n'''
|
|
>>> print f.__doc__
|
|
Backslashes in a raw docstring: m\n
|
|
\end{verbatim}
|
|
|
|
\item The starting column doesn't matter:
|
|
|
|
\begin{verbatim}
|
|
>>> assert "Easy!"
|
|
>>> import math
|
|
>>> math.floor(1.9)
|
|
1.0
|
|
\end{verbatim}
|
|
|
|
and as many leading whitespace characters are stripped from the
|
|
expected output as appeared in the initial \code{'>>>~'} line
|
|
that started the example.
|
|
\end{itemize}
|
|
|
|
\subsubsection{What's the Execution Context?\label{doctest-execution-context}}
|
|
|
|
By default, each time \refmodule{doctest} finds a docstring to test, it
|
|
uses a \emph{shallow copy} of \module{M}'s globals, so that running tests
|
|
doesn't change the module's real globals, and so that one test in
|
|
\module{M} can't leave behind crumbs that accidentally allow another test
|
|
to work. This means examples can freely use any names defined at top-level
|
|
in \module{M}, and names defined earlier in the docstring being run.
|
|
Examples cannot see names defined in other docstrings.
|
|
|
|
You can force use of your own dict as the execution context by passing
|
|
\code{globs=your_dict} to \function{testmod()} or
|
|
\function{testfile()} instead.
|
|
|
|
\subsubsection{What About Exceptions?\label{doctest-exceptions}}
|
|
|
|
No problem, provided that the traceback is the only output produced by
|
|
the example: just paste in the traceback.\footnote{Examples containing
|
|
both expected output and an exception are not supported. Trying
|
|
to guess where one ends and the other begins is too error-prone,
|
|
and that also makes for a confusing test.}
|
|
Since tracebacks contain details that are likely to change rapidly (for
|
|
example, exact file paths and line numbers), this is one case where doctest
|
|
works hard to be flexible in what it accepts.
|
|
|
|
Simple example:
|
|
|
|
\begin{verbatim}
|
|
>>> [1, 2, 3].remove(42)
|
|
Traceback (most recent call last):
|
|
File "<stdin>", line 1, in ?
|
|
ValueError: list.remove(x): x not in list
|
|
\end{verbatim}
|
|
|
|
That doctest succeeds if \exception{ValueError} is raised, with the
|
|
\samp{list.remove(x): x not in list} detail as shown.
|
|
|
|
The expected output for an exception must start with a traceback
|
|
header, which may be either of the following two lines, indented the
|
|
same as the first line of the example:
|
|
|
|
\begin{verbatim}
|
|
Traceback (most recent call last):
|
|
Traceback (innermost last):
|
|
\end{verbatim}
|
|
|
|
The traceback header is followed by an optional traceback stack, whose
|
|
contents are ignored by doctest. The traceback stack is typically
|
|
omitted, or copied verbatim from an interactive session.
|
|
|
|
The traceback stack is followed by the most interesting part: the
|
|
line(s) containing the exception type and detail. This is usually the
|
|
last line of a traceback, but can extend across multiple lines if the
|
|
exception has a multi-line detail:
|
|
|
|
\begin{verbatim}
|
|
>>> raise ValueError('multi\n line\ndetail')
|
|
Traceback (most recent call last):
|
|
File "<stdin>", line 1, in ?
|
|
ValueError: multi
|
|
line
|
|
detail
|
|
\end{verbatim}
|
|
|
|
The last three lines (starting with \exception{ValueError}) are
|
|
compared against the exception's type and detail, and the rest are
|
|
ignored.
|
|
|
|
Best practice is to omit the traceback stack, unless it adds
|
|
significant documentation value to the example. So the last example
|
|
is probably better as:
|
|
|
|
\begin{verbatim}
|
|
>>> raise ValueError('multi\n line\ndetail')
|
|
Traceback (most recent call last):
|
|
...
|
|
ValueError: multi
|
|
line
|
|
detail
|
|
\end{verbatim}
|
|
|
|
Note that tracebacks are treated very specially. In particular, in the
|
|
rewritten example, the use of \samp{...} is independent of doctest's
|
|
\constant{ELLIPSIS} option. The ellipsis in that example could be left
|
|
out, or could just as well be three (or three hundred) commas or digits,
|
|
or an indented transcript of a Monty Python skit.
|
|
|
|
Some details you should read once, but won't need to remember:
|
|
|
|
\begin{itemize}
|
|
|
|
\item Doctest can't guess whether your expected output came from an
|
|
exception traceback or from ordinary printing. So, e.g., an example
|
|
that expects \samp{ValueError: 42 is prime} will pass whether
|
|
\exception{ValueError} is actually raised or if the example merely
|
|
prints that traceback text. In practice, ordinary output rarely begins
|
|
with a traceback header line, so this doesn't create real problems.
|
|
|
|
\item Each line of the traceback stack (if present) must be indented
|
|
further than the first line of the example, \emph{or} start with a
|
|
non-alphanumeric character. The first line following the traceback
|
|
header indented the same and starting with an alphanumeric is taken
|
|
to be the start of the exception detail. Of course this does the
|
|
right thing for genuine tracebacks.
|
|
|
|
\item When the \constant{IGNORE_EXCEPTION_DETAIL} doctest option is
|
|
is specified, everything following the leftmost colon is ignored.
|
|
|
|
\item The interactive shell omits the traceback header line for some
|
|
\exception{SyntaxError}s. But doctest uses the traceback header
|
|
line to distinguish exceptions from non-exceptions. So in the rare
|
|
case where you need to test a \exception{SyntaxError} that omits the
|
|
traceback header, you will need to manually add the traceback header
|
|
line to your test example.
|
|
|
|
\item For some \exception{SyntaxError}s, Python displays the character
|
|
position of the syntax error, using a \code{\^} marker:
|
|
|
|
\begin{verbatim}
|
|
>>> 1 1
|
|
File "<stdin>", line 1
|
|
1 1
|
|
^
|
|
SyntaxError: invalid syntax
|
|
\end{verbatim}
|
|
|
|
Since the lines showing the position of the error come before the
|
|
exception type and detail, they are not checked by doctest. For
|
|
example, the following test would pass, even though it puts the
|
|
\code{\^} marker in the wrong location:
|
|
|
|
\begin{verbatim}
|
|
>>> 1 1
|
|
Traceback (most recent call last):
|
|
File "<stdin>", line 1
|
|
1 1
|
|
^
|
|
SyntaxError: invalid syntax
|
|
\end{verbatim}
|
|
|
|
\end{itemize}
|
|
|
|
\versionchanged[The ability to handle a multi-line exception detail,
|
|
and the \constant{IGNORE_EXCEPTION_DETAIL} doctest option,
|
|
were added]{2.4}
|
|
|
|
\subsubsection{Option Flags and Directives\label{doctest-options}}
|
|
|
|
A number of option flags control various aspects of doctest's
|
|
behavior. Symbolic names for the flags are supplied as module constants,
|
|
which can be or'ed together and passed to various functions. The names
|
|
can also be used in doctest directives (see below).
|
|
|
|
The first group of options define test semantics, controlling
|
|
aspects of how doctest decides whether actual output matches an
|
|
example's expected output:
|
|
|
|
\begin{datadesc}{DONT_ACCEPT_TRUE_FOR_1}
|
|
By default, if an expected output block contains just \code{1},
|
|
an actual output block containing just \code{1} or just
|
|
\code{True} is considered to be a match, and similarly for \code{0}
|
|
versus \code{False}. When \constant{DONT_ACCEPT_TRUE_FOR_1} is
|
|
specified, neither substitution is allowed. The default behavior
|
|
caters to that Python changed the return type of many functions
|
|
from integer to boolean; doctests expecting "little integer"
|
|
output still work in these cases. This option will probably go
|
|
away, but not for several years.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{DONT_ACCEPT_BLANKLINE}
|
|
By default, if an expected output block contains a line
|
|
containing only the string \code{<BLANKLINE>}, then that line
|
|
will match a blank line in the actual output. Because a
|
|
genuinely blank line delimits the expected output, this is
|
|
the only way to communicate that a blank line is expected. When
|
|
\constant{DONT_ACCEPT_BLANKLINE} is specified, this substitution
|
|
is not allowed.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{NORMALIZE_WHITESPACE}
|
|
When specified, all sequences of whitespace (blanks and newlines) are
|
|
treated as equal. Any sequence of whitespace within the expected
|
|
output will match any sequence of whitespace within the actual output.
|
|
By default, whitespace must match exactly.
|
|
\constant{NORMALIZE_WHITESPACE} is especially useful when a line
|
|
of expected output is very long, and you want to wrap it across
|
|
multiple lines in your source.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{ELLIPSIS}
|
|
When specified, an ellipsis marker (\code{...}) in the expected output
|
|
can match any substring in the actual output. This includes
|
|
substrings that span line boundaries, and empty substrings, so it's
|
|
best to keep usage of this simple. Complicated uses can lead to the
|
|
same kinds of "oops, it matched too much!" surprises that \regexp{.*}
|
|
is prone to in regular expressions.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{IGNORE_EXCEPTION_DETAIL}
|
|
When specified, an example that expects an exception passes if
|
|
an exception of the expected type is raised, even if the exception
|
|
detail does not match. For example, an example expecting
|
|
\samp{ValueError: 42} will pass if the actual exception raised is
|
|
\samp{ValueError: 3*14}, but will fail, e.g., if
|
|
\exception{TypeError} is raised.
|
|
|
|
Note that a similar effect can be obtained using \constant{ELLIPSIS},
|
|
and \constant{IGNORE_EXCEPTION_DETAIL} may go away when Python releases
|
|
prior to 2.4 become uninteresting. Until then,
|
|
\constant{IGNORE_EXCEPTION_DETAIL} is the only clear way to write a
|
|
doctest that doesn't care about the exception detail yet continues
|
|
to pass under Python releases prior to 2.4 (doctest directives
|
|
appear to be comments to them). For example,
|
|
|
|
\begin{verbatim}
|
|
>>> (1, 2)[3] = 'moo' #doctest: +IGNORE_EXCEPTION_DETAIL
|
|
Traceback (most recent call last):
|
|
File "<stdin>", line 1, in ?
|
|
TypeError: object doesn't support item assignment
|
|
\end{verbatim}
|
|
|
|
passes under Python 2.4 and Python 2.3. The detail changed in 2.4,
|
|
to say "does not" instead of "doesn't".
|
|
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{SKIP}
|
|
|
|
When specified, do not run the example at all. This can be useful
|
|
in contexts where doctest examples serve as both documentation and
|
|
test cases, and an example should be included for documentation
|
|
purposes, but should not be checked. E.g., the example's output
|
|
might be random; or the example might depend on resources which
|
|
would be unavailable to the test driver.
|
|
|
|
The SKIP flag can also be used for temporarily "commenting out"
|
|
examples.
|
|
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{COMPARISON_FLAGS}
|
|
A bitmask or'ing together all the comparison flags above.
|
|
\end{datadesc}
|
|
|
|
The second group of options controls how test failures are reported:
|
|
|
|
\begin{datadesc}{REPORT_UDIFF}
|
|
When specified, failures that involve multi-line expected and
|
|
actual outputs are displayed using a unified diff.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{REPORT_CDIFF}
|
|
When specified, failures that involve multi-line expected and
|
|
actual outputs will be displayed using a context diff.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{REPORT_NDIFF}
|
|
When specified, differences are computed by \code{difflib.Differ},
|
|
using the same algorithm as the popular \file{ndiff.py} utility.
|
|
This is the only method that marks differences within lines as
|
|
well as across lines. For example, if a line of expected output
|
|
contains digit \code{1} where actual output contains letter \code{l},
|
|
a line is inserted with a caret marking the mismatching column
|
|
positions.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{REPORT_ONLY_FIRST_FAILURE}
|
|
When specified, display the first failing example in each doctest,
|
|
but suppress output for all remaining examples. This will prevent
|
|
doctest from reporting correct examples that break because of
|
|
earlier failures; but it might also hide incorrect examples that
|
|
fail independently of the first failure. When
|
|
\constant{REPORT_ONLY_FIRST_FAILURE} is specified, the remaining
|
|
examples are still run, and still count towards the total number of
|
|
failures reported; only the output is suppressed.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{REPORTING_FLAGS}
|
|
A bitmask or'ing together all the reporting flags above.
|
|
\end{datadesc}
|
|
|
|
"Doctest directives" may be used to modify the option flags for
|
|
individual examples. Doctest directives are expressed as a special
|
|
Python comment following an example's source code:
|
|
|
|
\begin{productionlist}[doctest]
|
|
\production{directive}
|
|
{"\#" "doctest:" \token{directive_options}}
|
|
\production{directive_options}
|
|
{\token{directive_option} ("," \token{directive_option})*}
|
|
\production{directive_option}
|
|
{\token{on_or_off} \token{directive_option_name}}
|
|
\production{on_or_off}
|
|
{"+" | "-"}
|
|
\production{directive_option_name}
|
|
{"DONT_ACCEPT_BLANKLINE" | "NORMALIZE_WHITESPACE" | ...}
|
|
\end{productionlist}
|
|
|
|
Whitespace is not allowed between the \code{+} or \code{-} and the
|
|
directive option name. The directive option name can be any of the
|
|
option flag names explained above.
|
|
|
|
An example's doctest directives modify doctest's behavior for that
|
|
single example. Use \code{+} to enable the named behavior, or
|
|
\code{-} to disable it.
|
|
|
|
For example, this test passes:
|
|
|
|
\begin{verbatim}
|
|
>>> print range(20) #doctest: +NORMALIZE_WHITESPACE
|
|
[0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
|
|
10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
|
|
\end{verbatim}
|
|
|
|
Without the directive it would fail, both because the actual output
|
|
doesn't have two blanks before the single-digit list elements, and
|
|
because the actual output is on a single line. This test also passes,
|
|
and also requires a directive to do so:
|
|
|
|
\begin{verbatim}
|
|
>>> print range(20) # doctest:+ELLIPSIS
|
|
[0, 1, ..., 18, 19]
|
|
\end{verbatim}
|
|
|
|
Multiple directives can be used on a single physical line, separated
|
|
by commas:
|
|
|
|
\begin{verbatim}
|
|
>>> print range(20) # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE
|
|
[0, 1, ..., 18, 19]
|
|
\end{verbatim}
|
|
|
|
If multiple directive comments are used for a single example, then
|
|
they are combined:
|
|
|
|
\begin{verbatim}
|
|
>>> print range(20) # doctest: +ELLIPSIS
|
|
... # doctest: +NORMALIZE_WHITESPACE
|
|
[0, 1, ..., 18, 19]
|
|
\end{verbatim}
|
|
|
|
As the previous example shows, you can add \samp{...} lines to your
|
|
example containing only directives. This can be useful when an
|
|
example is too long for a directive to comfortably fit on the same
|
|
line:
|
|
|
|
\begin{verbatim}
|
|
>>> print range(5) + range(10,20) + range(30,40) + range(50,60)
|
|
... # doctest: +ELLIPSIS
|
|
[0, ..., 4, 10, ..., 19, 30, ..., 39, 50, ..., 59]
|
|
\end{verbatim}
|
|
|
|
Note that since all options are disabled by default, and directives apply
|
|
only to the example they appear in, enabling options (via \code{+} in a
|
|
directive) is usually the only meaningful choice. However, option flags
|
|
can also be passed to functions that run doctests, establishing different
|
|
defaults. In such cases, disabling an option via \code{-} in a directive
|
|
can be useful.
|
|
|
|
\versionchanged[Constants \constant{DONT_ACCEPT_BLANKLINE},
|
|
\constant{NORMALIZE_WHITESPACE}, \constant{ELLIPSIS},
|
|
\constant{IGNORE_EXCEPTION_DETAIL},
|
|
\constant{REPORT_UDIFF}, \constant{REPORT_CDIFF},
|
|
\constant{REPORT_NDIFF}, \constant{REPORT_ONLY_FIRST_FAILURE},
|
|
\constant{COMPARISON_FLAGS} and \constant{REPORTING_FLAGS}
|
|
were added; by default \code{<BLANKLINE>} in expected output
|
|
matches an empty line in actual output; and doctest directives
|
|
were added]{2.4}
|
|
\versionchanged[Constant \constant{SKIP} was added]{2.5}
|
|
|
|
There's also a way to register new option flag names, although this
|
|
isn't useful unless you intend to extend \refmodule{doctest} internals
|
|
via subclassing:
|
|
|
|
\begin{funcdesc}{register_optionflag}{name}
|
|
Create a new option flag with a given name, and return the new
|
|
flag's integer value. \function{register_optionflag()} can be
|
|
used when subclassing \class{OutputChecker} or
|
|
\class{DocTestRunner} to create new options that are supported by
|
|
your subclasses. \function{register_optionflag} should always be
|
|
called using the following idiom:
|
|
|
|
\begin{verbatim}
|
|
MY_FLAG = register_optionflag('MY_FLAG')
|
|
\end{verbatim}
|
|
|
|
\versionadded{2.4}
|
|
\end{funcdesc}
|
|
|
|
\subsubsection{Warnings\label{doctest-warnings}}
|
|
|
|
\refmodule{doctest} is serious about requiring exact matches in expected
|
|
output. If even a single character doesn't match, the test fails. This
|
|
will probably surprise you a few times, as you learn exactly what Python
|
|
does and doesn't guarantee about output. For example, when printing a
|
|
dict, Python doesn't guarantee that the key-value pairs will be printed
|
|
in any particular order, so a test like
|
|
|
|
% Hey! What happened to Monty Python examples?
|
|
% Tim: ask Guido -- it's his example!
|
|
\begin{verbatim}
|
|
>>> foo()
|
|
{"Hermione": "hippogryph", "Harry": "broomstick"}
|
|
\end{verbatim}
|
|
|
|
is vulnerable! One workaround is to do
|
|
|
|
\begin{verbatim}
|
|
>>> foo() == {"Hermione": "hippogryph", "Harry": "broomstick"}
|
|
True
|
|
\end{verbatim}
|
|
|
|
instead. Another is to do
|
|
|
|
\begin{verbatim}
|
|
>>> d = foo().items()
|
|
>>> d.sort()
|
|
>>> d
|
|
[('Harry', 'broomstick'), ('Hermione', 'hippogryph')]
|
|
\end{verbatim}
|
|
|
|
There are others, but you get the idea.
|
|
|
|
Another bad idea is to print things that embed an object address, like
|
|
|
|
\begin{verbatim}
|
|
>>> id(1.0) # certain to fail some of the time
|
|
7948648
|
|
>>> class C: pass
|
|
>>> C() # the default repr() for instances embeds an address
|
|
<__main__.C instance at 0x00AC18F0>
|
|
\end{verbatim}
|
|
|
|
The \constant{ELLIPSIS} directive gives a nice approach for the last
|
|
example:
|
|
|
|
\begin{verbatim}
|
|
>>> C() #doctest: +ELLIPSIS
|
|
<__main__.C instance at 0x...>
|
|
\end{verbatim}
|
|
|
|
Floating-point numbers are also subject to small output variations across
|
|
platforms, because Python defers to the platform C library for float
|
|
formatting, and C libraries vary widely in quality here.
|
|
|
|
\begin{verbatim}
|
|
>>> 1./7 # risky
|
|
0.14285714285714285
|
|
>>> print 1./7 # safer
|
|
0.142857142857
|
|
>>> print round(1./7, 6) # much safer
|
|
0.142857
|
|
\end{verbatim}
|
|
|
|
Numbers of the form \code{I/2.**J} are safe across all platforms, and I
|
|
often contrive doctest examples to produce numbers of that form:
|
|
|
|
\begin{verbatim}
|
|
>>> 3./4 # utterly safe
|
|
0.75
|
|
\end{verbatim}
|
|
|
|
Simple fractions are also easier for people to understand, and that makes
|
|
for better documentation.
|
|
|
|
\subsection{Basic API\label{doctest-basic-api}}
|
|
|
|
The functions \function{testmod()} and \function{testfile()} provide a
|
|
simple interface to doctest that should be sufficient for most basic
|
|
uses. For a less formal introduction to these two functions, see
|
|
sections \ref{doctest-simple-testmod} and
|
|
\ref{doctest-simple-testfile}.
|
|
|
|
\begin{funcdesc}{testfile}{filename\optional{, module_relative}\optional{,
|
|
name}\optional{, package}\optional{,
|
|
globs}\optional{, verbose}\optional{,
|
|
report}\optional{, optionflags}\optional{,
|
|
extraglobs}\optional{, raise_on_error}\optional{,
|
|
parser}\optional{, encoding}}
|
|
|
|
All arguments except \var{filename} are optional, and should be
|
|
specified in keyword form.
|
|
|
|
Test examples in the file named \var{filename}. Return
|
|
\samp{(\var{failure_count}, \var{test_count})}.
|
|
|
|
Optional argument \var{module_relative} specifies how the filename
|
|
should be interpreted:
|
|
|
|
\begin{itemize}
|
|
\item If \var{module_relative} is \code{True} (the default), then
|
|
\var{filename} specifies an OS-independent module-relative
|
|
path. By default, this path is relative to the calling
|
|
module's directory; but if the \var{package} argument is
|
|
specified, then it is relative to that package. To ensure
|
|
OS-independence, \var{filename} should use \code{/} characters
|
|
to separate path segments, and may not be an absolute path
|
|
(i.e., it may not begin with \code{/}).
|
|
\item If \var{module_relative} is \code{False}, then \var{filename}
|
|
specifies an OS-specific path. The path may be absolute or
|
|
relative; relative paths are resolved with respect to the
|
|
current working directory.
|
|
\end{itemize}
|
|
|
|
Optional argument \var{name} gives the name of the test; by default,
|
|
or if \code{None}, \code{os.path.basename(\var{filename})} is used.
|
|
|
|
Optional argument \var{package} is a Python package or the name of a
|
|
Python package whose directory should be used as the base directory
|
|
for a module-relative filename. If no package is specified, then
|
|
the calling module's directory is used as the base directory for
|
|
module-relative filenames. It is an error to specify \var{package}
|
|
if \var{module_relative} is \code{False}.
|
|
|
|
Optional argument \var{globs} gives a dict to be used as the globals
|
|
when executing examples. A new shallow copy of this dict is
|
|
created for the doctest, so its examples start with a clean slate.
|
|
By default, or if \code{None}, a new empty dict is used.
|
|
|
|
Optional argument \var{extraglobs} gives a dict merged into the
|
|
globals used to execute examples. This works like
|
|
\method{dict.update()}: if \var{globs} and \var{extraglobs} have a
|
|
common key, the associated value in \var{extraglobs} appears in the
|
|
combined dict. By default, or if \code{None}, no extra globals are
|
|
used. This is an advanced feature that allows parameterization of
|
|
doctests. For example, a doctest can be written for a base class, using
|
|
a generic name for the class, then reused to test any number of
|
|
subclasses by passing an \var{extraglobs} dict mapping the generic
|
|
name to the subclass to be tested.
|
|
|
|
Optional argument \var{verbose} prints lots of stuff if true, and prints
|
|
only failures if false; by default, or if \code{None}, it's true
|
|
if and only if \code{'-v'} is in \code{sys.argv}.
|
|
|
|
Optional argument \var{report} prints a summary at the end when true,
|
|
else prints nothing at the end. In verbose mode, the summary is
|
|
detailed, else the summary is very brief (in fact, empty if all tests
|
|
passed).
|
|
|
|
Optional argument \var{optionflags} or's together option flags. See
|
|
section~\ref{doctest-options}.
|
|
|
|
Optional argument \var{raise_on_error} defaults to false. If true,
|
|
an exception is raised upon the first failure or unexpected exception
|
|
in an example. This allows failures to be post-mortem debugged.
|
|
Default behavior is to continue running examples.
|
|
|
|
Optional argument \var{parser} specifies a \class{DocTestParser} (or
|
|
subclass) that should be used to extract tests from the files. It
|
|
defaults to a normal parser (i.e., \code{\class{DocTestParser}()}).
|
|
|
|
Optional argument \var{encoding} specifies an encoding that should
|
|
be used to convert the file to unicode.
|
|
|
|
\versionadded{2.4}
|
|
|
|
\versionchanged[The parameter \var{encoding} was added]{2.5}
|
|
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{testmod}{\optional{m}\optional{, name}\optional{,
|
|
globs}\optional{, verbose}\optional{,
|
|
report}\optional{,
|
|
optionflags}\optional{, extraglobs}\optional{,
|
|
raise_on_error}\optional{, exclude_empty}}
|
|
|
|
All arguments are optional, and all except for \var{m} should be
|
|
specified in keyword form.
|
|
|
|
Test examples in docstrings in functions and classes reachable
|
|
from module \var{m} (or module \module{__main__} if \var{m} is not
|
|
supplied or is \code{None}), starting with \code{\var{m}.__doc__}.
|
|
|
|
Also test examples reachable from dict \code{\var{m}.__test__}, if it
|
|
exists and is not \code{None}. \code{\var{m}.__test__} maps
|
|
names (strings) to functions, classes and strings; function and class
|
|
docstrings are searched for examples; strings are searched directly,
|
|
as if they were docstrings.
|
|
|
|
Only docstrings attached to objects belonging to module \var{m} are
|
|
searched.
|
|
|
|
Return \samp{(\var{failure_count}, \var{test_count})}.
|
|
|
|
Optional argument \var{name} gives the name of the module; by default,
|
|
or if \code{None}, \code{\var{m}.__name__} is used.
|
|
|
|
Optional argument \var{exclude_empty} defaults to false. If true,
|
|
objects for which no doctests are found are excluded from consideration.
|
|
The default is a backward compatibility hack, so that code still
|
|
using \method{doctest.master.summarize()} in conjunction with
|
|
\function{testmod()} continues to get output for objects with no tests.
|
|
The \var{exclude_empty} argument to the newer \class{DocTestFinder}
|
|
constructor defaults to true.
|
|
|
|
Optional arguments \var{extraglobs}, \var{verbose}, \var{report},
|
|
\var{optionflags}, \var{raise_on_error}, and \var{globs} are the same as
|
|
for function \function{testfile()} above, except that \var{globs}
|
|
defaults to \code{\var{m}.__dict__}.
|
|
|
|
\versionchanged[The parameter \var{optionflags} was added]{2.3}
|
|
|
|
\versionchanged[The parameters \var{extraglobs}, \var{raise_on_error}
|
|
and \var{exclude_empty} were added]{2.4}
|
|
|
|
\versionchanged[The optional argument \var{isprivate}, deprecated
|
|
in 2.4, was removed]{2.5}
|
|
|
|
\end{funcdesc}
|
|
|
|
There's also a function to run the doctests associated with a single object.
|
|
This function is provided for backward compatibility. There are no plans
|
|
to deprecate it, but it's rarely useful:
|
|
|
|
\begin{funcdesc}{run_docstring_examples}{f, globs\optional{,
|
|
verbose}\optional{, name}\optional{,
|
|
compileflags}\optional{, optionflags}}
|
|
|
|
Test examples associated with object \var{f}; for example, \var{f} may
|
|
be a module, function, or class object.
|
|
|
|
A shallow copy of dictionary argument \var{globs} is used for the
|
|
execution context.
|
|
|
|
Optional argument \var{name} is used in failure messages, and defaults
|
|
to \code{"NoName"}.
|
|
|
|
If optional argument \var{verbose} is true, output is generated even
|
|
if there are no failures. By default, output is generated only in case
|
|
of an example failure.
|
|
|
|
Optional argument \var{compileflags} gives the set of flags that should
|
|
be used by the Python compiler when running the examples. By default, or
|
|
if \code{None}, flags are deduced corresponding to the set of future
|
|
features found in \var{globs}.
|
|
|
|
Optional argument \var{optionflags} works as for function
|
|
\function{testfile()} above.
|
|
\end{funcdesc}
|
|
|
|
\subsection{Unittest API\label{doctest-unittest-api}}
|
|
|
|
As your collection of doctest'ed modules grows, you'll want a way to run
|
|
all their doctests systematically. Prior to Python 2.4, \refmodule{doctest}
|
|
had a barely documented \class{Tester} class that supplied a rudimentary
|
|
way to combine doctests from multiple modules. \class{Tester} was feeble,
|
|
and in practice most serious Python testing frameworks build on the
|
|
\refmodule{unittest} module, which supplies many flexible ways to combine
|
|
tests from multiple sources. So, in Python 2.4, \refmodule{doctest}'s
|
|
\class{Tester} class is deprecated, and \refmodule{doctest} provides two
|
|
functions that can be used to create \refmodule{unittest} test suites from
|
|
modules and text files containing doctests. These test suites can then be
|
|
run using \refmodule{unittest} test runners:
|
|
|
|
\begin{verbatim}
|
|
import unittest
|
|
import doctest
|
|
import my_module_with_doctests, and_another
|
|
|
|
suite = unittest.TestSuite()
|
|
for mod in my_module_with_doctests, and_another:
|
|
suite.addTest(doctest.DocTestSuite(mod))
|
|
runner = unittest.TextTestRunner()
|
|
runner.run(suite)
|
|
\end{verbatim}
|
|
|
|
There are two main functions for creating \class{\refmodule{unittest}.TestSuite}
|
|
instances from text files and modules with doctests:
|
|
|
|
\begin{funcdesc}{DocFileSuite}{\optional{module_relative}\optional{,
|
|
package}\optional{, setUp}\optional{,
|
|
tearDown}\optional{, globs}\optional{,
|
|
optionflags}\optional{, parser}\optional{,
|
|
encoding}}
|
|
|
|
Convert doctest tests from one or more text files to a
|
|
\class{\refmodule{unittest}.TestSuite}.
|
|
|
|
The returned \class{\refmodule{unittest}.TestSuite} is to be run by the
|
|
unittest framework and runs the interactive examples in each file. If an
|
|
example in any file fails, then the synthesized unit test fails, and a
|
|
\exception{failureException} exception is raised showing the name of the
|
|
file containing the test and a (sometimes approximate) line number.
|
|
|
|
Pass one or more paths (as strings) to text files to be examined.
|
|
|
|
Options may be provided as keyword arguments:
|
|
|
|
Optional argument \var{module_relative} specifies how
|
|
the filenames in \var{paths} should be interpreted:
|
|
|
|
\begin{itemize}
|
|
\item If \var{module_relative} is \code{True} (the default), then
|
|
each filename specifies an OS-independent module-relative
|
|
path. By default, this path is relative to the calling
|
|
module's directory; but if the \var{package} argument is
|
|
specified, then it is relative to that package. To ensure
|
|
OS-independence, each filename should use \code{/} characters
|
|
to separate path segments, and may not be an absolute path
|
|
(i.e., it may not begin with \code{/}).
|
|
\item If \var{module_relative} is \code{False}, then each filename
|
|
specifies an OS-specific path. The path may be absolute or
|
|
relative; relative paths are resolved with respect to the
|
|
current working directory.
|
|
\end{itemize}
|
|
|
|
Optional argument \var{package} is a Python package or the name
|
|
of a Python package whose directory should be used as the base
|
|
directory for module-relative filenames. If no package is
|
|
specified, then the calling module's directory is used as the base
|
|
directory for module-relative filenames. It is an error to specify
|
|
\var{package} if \var{module_relative} is \code{False}.
|
|
|
|
Optional argument \var{setUp} specifies a set-up function for
|
|
the test suite. This is called before running the tests in each
|
|
file. The \var{setUp} function will be passed a \class{DocTest}
|
|
object. The setUp function can access the test globals as the
|
|
\var{globs} attribute of the test passed.
|
|
|
|
Optional argument \var{tearDown} specifies a tear-down function
|
|
for the test suite. This is called after running the tests in each
|
|
file. The \var{tearDown} function will be passed a \class{DocTest}
|
|
object. The setUp function can access the test globals as the
|
|
\var{globs} attribute of the test passed.
|
|
|
|
Optional argument \var{globs} is a dictionary containing the
|
|
initial global variables for the tests. A new copy of this
|
|
dictionary is created for each test. By default, \var{globs} is
|
|
a new empty dictionary.
|
|
|
|
Optional argument \var{optionflags} specifies the default
|
|
doctest options for the tests, created by or-ing together
|
|
individual option flags. See section~\ref{doctest-options}.
|
|
See function \function{set_unittest_reportflags()} below for
|
|
a better way to set reporting options.
|
|
|
|
Optional argument \var{parser} specifies a \class{DocTestParser} (or
|
|
subclass) that should be used to extract tests from the files. It
|
|
defaults to a normal parser (i.e., \code{\class{DocTestParser}()}).
|
|
|
|
Optional argument \var{encoding} specifies an encoding that should
|
|
be used to convert the file to unicode.
|
|
|
|
\versionadded{2.4}
|
|
|
|
\versionchanged[The global \code{__file__} was added to the
|
|
globals provided to doctests loaded from a text file using
|
|
\function{DocFileSuite()}]{2.5}
|
|
|
|
\versionchanged[The parameter \var{encoding} was added]{2.5}
|
|
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{DocTestSuite}{\optional{module}\optional{,
|
|
globs}\optional{, extraglobs}\optional{,
|
|
test_finder}\optional{, setUp}\optional{,
|
|
tearDown}\optional{, checker}}
|
|
Convert doctest tests for a module to a
|
|
\class{\refmodule{unittest}.TestSuite}.
|
|
|
|
The returned \class{\refmodule{unittest}.TestSuite} is to be run by the
|
|
unittest framework and runs each doctest in the module. If any of the
|
|
doctests fail, then the synthesized unit test fails, and a
|
|
\exception{failureException} exception is raised showing the name of the
|
|
file containing the test and a (sometimes approximate) line number.
|
|
|
|
Optional argument \var{module} provides the module to be tested. It
|
|
can be a module object or a (possibly dotted) module name. If not
|
|
specified, the module calling this function is used.
|
|
|
|
Optional argument \var{globs} is a dictionary containing the
|
|
initial global variables for the tests. A new copy of this
|
|
dictionary is created for each test. By default, \var{globs} is
|
|
a new empty dictionary.
|
|
|
|
Optional argument \var{extraglobs} specifies an extra set of
|
|
global variables, which is merged into \var{globs}. By default, no
|
|
extra globals are used.
|
|
|
|
Optional argument \var{test_finder} is the \class{DocTestFinder}
|
|
object (or a drop-in replacement) that is used to extract doctests
|
|
from the module.
|
|
|
|
Optional arguments \var{setUp}, \var{tearDown}, and \var{optionflags}
|
|
are the same as for function \function{DocFileSuite()} above.
|
|
|
|
\versionadded{2.3}
|
|
|
|
\versionchanged[The parameters \var{globs}, \var{extraglobs},
|
|
\var{test_finder}, \var{setUp}, \var{tearDown}, and
|
|
\var{optionflags} were added; this function now uses the same search
|
|
technique as \function{testmod()}]{2.4}
|
|
\end{funcdesc}
|
|
|
|
Under the covers, \function{DocTestSuite()} creates a
|
|
\class{\refmodule{unittest}.TestSuite} out of \class{doctest.DocTestCase}
|
|
instances, and \class{DocTestCase} is a subclass of
|
|
\class{\refmodule{unittest}.TestCase}. \class{DocTestCase} isn't documented
|
|
here (it's an internal detail), but studying its code can answer questions
|
|
about the exact details of \refmodule{unittest} integration.
|
|
|
|
Similarly, \function{DocFileSuite()} creates a
|
|
\class{\refmodule{unittest}.TestSuite} out of \class{doctest.DocFileCase}
|
|
instances, and \class{DocFileCase} is a subclass of \class{DocTestCase}.
|
|
|
|
So both ways of creating a \class{\refmodule{unittest}.TestSuite} run
|
|
instances of \class{DocTestCase}. This is important for a subtle reason:
|
|
when you run \refmodule{doctest} functions yourself, you can control the
|
|
\refmodule{doctest} options in use directly, by passing option flags to
|
|
\refmodule{doctest} functions. However, if you're writing a
|
|
\refmodule{unittest} framework, \refmodule{unittest} ultimately controls
|
|
when and how tests get run. The framework author typically wants to
|
|
control \refmodule{doctest} reporting options (perhaps, e.g., specified by
|
|
command line options), but there's no way to pass options through
|
|
\refmodule{unittest} to \refmodule{doctest} test runners.
|
|
|
|
For this reason, \refmodule{doctest} also supports a notion of
|
|
\refmodule{doctest} reporting flags specific to \refmodule{unittest}
|
|
support, via this function:
|
|
|
|
\begin{funcdesc}{set_unittest_reportflags}{flags}
|
|
Set the \refmodule{doctest} reporting flags to use.
|
|
|
|
Argument \var{flags} or's together option flags. See
|
|
section~\ref{doctest-options}. Only "reporting flags" can be used.
|
|
|
|
This is a module-global setting, and affects all future doctests run by
|
|
module \refmodule{unittest}: the \method{runTest()} method of
|
|
\class{DocTestCase} looks at the option flags specified for the test case
|
|
when the \class{DocTestCase} instance was constructed. If no reporting
|
|
flags were specified (which is the typical and expected case),
|
|
\refmodule{doctest}'s \refmodule{unittest} reporting flags are or'ed into
|
|
the option flags, and the option flags so augmented are passed to the
|
|
\class{DocTestRunner} instance created to run the doctest. If any
|
|
reporting flags were specified when the \class{DocTestCase} instance was
|
|
constructed, \refmodule{doctest}'s \refmodule{unittest} reporting flags
|
|
are ignored.
|
|
|
|
The value of the \refmodule{unittest} reporting flags in effect before the
|
|
function was called is returned by the function.
|
|
|
|
\versionadded{2.4}
|
|
\end{funcdesc}
|
|
|
|
|
|
\subsection{Advanced API\label{doctest-advanced-api}}
|
|
|
|
The basic API is a simple wrapper that's intended to make doctest easy
|
|
to use. It is fairly flexible, and should meet most users' needs;
|
|
however, if you require more fine-grained control over testing, or
|
|
wish to extend doctest's capabilities, then you should use the
|
|
advanced API.
|
|
|
|
The advanced API revolves around two container classes, which are used
|
|
to store the interactive examples extracted from doctest cases:
|
|
|
|
\begin{itemize}
|
|
\item \class{Example}: A single python statement, paired with its
|
|
expected output.
|
|
\item \class{DocTest}: A collection of \class{Example}s, typically
|
|
extracted from a single docstring or text file.
|
|
\end{itemize}
|
|
|
|
Additional processing classes are defined to find, parse, and run, and
|
|
check doctest examples:
|
|
|
|
\begin{itemize}
|
|
\item \class{DocTestFinder}: Finds all docstrings in a given module,
|
|
and uses a \class{DocTestParser} to create a \class{DocTest}
|
|
from every docstring that contains interactive examples.
|
|
\item \class{DocTestParser}: Creates a \class{DocTest} object from
|
|
a string (such as an object's docstring).
|
|
\item \class{DocTestRunner}: Executes the examples in a
|
|
\class{DocTest}, and uses an \class{OutputChecker} to verify
|
|
their output.
|
|
\item \class{OutputChecker}: Compares the actual output from a
|
|
doctest example with the expected output, and decides whether
|
|
they match.
|
|
\end{itemize}
|
|
|
|
The relationships among these processing classes are summarized in the
|
|
following diagram:
|
|
|
|
\begin{verbatim}
|
|
list of:
|
|
+------+ +---------+
|
|
|module| --DocTestFinder-> | DocTest | --DocTestRunner-> results
|
|
+------+ | ^ +---------+ | ^ (printed)
|
|
| | | Example | | |
|
|
v | | ... | v |
|
|
DocTestParser | Example | OutputChecker
|
|
+---------+
|
|
\end{verbatim}
|
|
|
|
\subsubsection{DocTest Objects\label{doctest-DocTest}}
|
|
\begin{classdesc}{DocTest}{examples, globs, name, filename, lineno,
|
|
docstring}
|
|
A collection of doctest examples that should be run in a single
|
|
namespace. The constructor arguments are used to initialize the
|
|
member variables of the same names.
|
|
\versionadded{2.4}
|
|
\end{classdesc}
|
|
|
|
\class{DocTest} defines the following member variables. They are
|
|
initialized by the constructor, and should not be modified directly.
|
|
|
|
\begin{memberdesc}{examples}
|
|
A list of \class{Example} objects encoding the individual
|
|
interactive Python examples that should be run by this test.
|
|
\end{memberdesc}
|
|
|
|
\begin{memberdesc}{globs}
|
|
The namespace (aka globals) that the examples should be run in.
|
|
This is a dictionary mapping names to values. Any changes to the
|
|
namespace made by the examples (such as binding new variables)
|
|
will be reflected in \member{globs} after the test is run.
|
|
\end{memberdesc}
|
|
|
|
\begin{memberdesc}{name}
|
|
A string name identifying the \class{DocTest}. Typically, this is
|
|
the name of the object or file that the test was extracted from.
|
|
\end{memberdesc}
|
|
|
|
\begin{memberdesc}{filename}
|
|
The name of the file that this \class{DocTest} was extracted from;
|
|
or \code{None} if the filename is unknown, or if the
|
|
\class{DocTest} was not extracted from a file.
|
|
\end{memberdesc}
|
|
|
|
\begin{memberdesc}{lineno}
|
|
The line number within \member{filename} where this
|
|
\class{DocTest} begins, or \code{None} if the line number is
|
|
unavailable. This line number is zero-based with respect to the
|
|
beginning of the file.
|
|
\end{memberdesc}
|
|
|
|
\begin{memberdesc}{docstring}
|
|
The string that the test was extracted from, or `None` if the
|
|
string is unavailable, or if the test was not extracted from a
|
|
string.
|
|
\end{memberdesc}
|
|
|
|
\subsubsection{Example Objects\label{doctest-Example}}
|
|
\begin{classdesc}{Example}{source, want\optional{,
|
|
exc_msg}\optional{, lineno}\optional{,
|
|
indent}\optional{, options}}
|
|
A single interactive example, consisting of a Python statement and
|
|
its expected output. The constructor arguments are used to
|
|
initialize the member variables of the same names.
|
|
\versionadded{2.4}
|
|
\end{classdesc}
|
|
|
|
\class{Example} defines the following member variables. They are
|
|
initialized by the constructor, and should not be modified directly.
|
|
|
|
\begin{memberdesc}{source}
|
|
A string containing the example's source code. This source code
|
|
consists of a single Python statement, and always ends with a
|
|
newline; the constructor adds a newline when necessary.
|
|
\end{memberdesc}
|
|
|
|
\begin{memberdesc}{want}
|
|
The expected output from running the example's source code (either
|
|
from stdout, or a traceback in case of exception). \member{want}
|
|
ends with a newline unless no output is expected, in which case
|
|
it's an empty string. The constructor adds a newline when
|
|
necessary.
|
|
\end{memberdesc}
|
|
|
|
\begin{memberdesc}{exc_msg}
|
|
The exception message generated by the example, if the example is
|
|
expected to generate an exception; or \code{None} if it is not
|
|
expected to generate an exception. This exception message is
|
|
compared against the return value of
|
|
\function{traceback.format_exception_only()}. \member{exc_msg}
|
|
ends with a newline unless it's \code{None}. The constructor adds
|
|
a newline if needed.
|
|
\end{memberdesc}
|
|
|
|
\begin{memberdesc}{lineno}
|
|
The line number within the string containing this example where
|
|
the example begins. This line number is zero-based with respect
|
|
to the beginning of the containing string.
|
|
\end{memberdesc}
|
|
|
|
\begin{memberdesc}{indent}
|
|
The example's indentation in the containing string, i.e., the
|
|
number of space characters that precede the example's first
|
|
prompt.
|
|
\end{memberdesc}
|
|
|
|
\begin{memberdesc}{options}
|
|
A dictionary mapping from option flags to \code{True} or
|
|
\code{False}, which is used to override default options for this
|
|
example. Any option flags not contained in this dictionary are
|
|
left at their default value (as specified by the
|
|
\class{DocTestRunner}'s \member{optionflags}).
|
|
By default, no options are set.
|
|
\end{memberdesc}
|
|
|
|
\subsubsection{DocTestFinder objects\label{doctest-DocTestFinder}}
|
|
\begin{classdesc}{DocTestFinder}{\optional{verbose}\optional{,
|
|
parser}\optional{, recurse}\optional{,
|
|
exclude_empty}}
|
|
A processing class used to extract the \class{DocTest}s that are
|
|
relevant to a given object, from its docstring and the docstrings
|
|
of its contained objects. \class{DocTest}s can currently be
|
|
extracted from the following object types: modules, functions,
|
|
classes, methods, staticmethods, classmethods, and properties.
|
|
|
|
The optional argument \var{verbose} can be used to display the
|
|
objects searched by the finder. It defaults to \code{False} (no
|
|
output).
|
|
|
|
The optional argument \var{parser} specifies the
|
|
\class{DocTestParser} object (or a drop-in replacement) that is
|
|
used to extract doctests from docstrings.
|
|
|
|
If the optional argument \var{recurse} is false, then
|
|
\method{DocTestFinder.find()} will only examine the given object,
|
|
and not any contained objects.
|
|
|
|
If the optional argument \var{exclude_empty} is false, then
|
|
\method{DocTestFinder.find()} will include tests for objects with
|
|
empty docstrings.
|
|
|
|
\versionadded{2.4}
|
|
\end{classdesc}
|
|
|
|
\class{DocTestFinder} defines the following method:
|
|
|
|
\begin{methoddesc}{find}{obj\optional{, name}\optional{,
|
|
module}\optional{, globs}\optional{, extraglobs}}
|
|
Return a list of the \class{DocTest}s that are defined by
|
|
\var{obj}'s docstring, or by any of its contained objects'
|
|
docstrings.
|
|
|
|
The optional argument \var{name} specifies the object's name; this
|
|
name will be used to construct names for the returned
|
|
\class{DocTest}s. If \var{name} is not specified, then
|
|
\code{\var{obj}.__name__} is used.
|
|
|
|
The optional parameter \var{module} is the module that contains
|
|
the given object. If the module is not specified or is None, then
|
|
the test finder will attempt to automatically determine the
|
|
correct module. The object's module is used:
|
|
|
|
\begin{itemize}
|
|
\item As a default namespace, if \var{globs} is not specified.
|
|
\item To prevent the DocTestFinder from extracting DocTests
|
|
from objects that are imported from other modules. (Contained
|
|
objects with modules other than \var{module} are ignored.)
|
|
\item To find the name of the file containing the object.
|
|
\item To help find the line number of the object within its file.
|
|
\end{itemize}
|
|
|
|
If \var{module} is \code{False}, no attempt to find the module
|
|
will be made. This is obscure, of use mostly in testing doctest
|
|
itself: if \var{module} is \code{False}, or is \code{None} but
|
|
cannot be found automatically, then all objects are considered to
|
|
belong to the (non-existent) module, so all contained objects will
|
|
(recursively) be searched for doctests.
|
|
|
|
The globals for each \class{DocTest} is formed by combining
|
|
\var{globs} and \var{extraglobs} (bindings in \var{extraglobs}
|
|
override bindings in \var{globs}). A new shallow copy of the globals
|
|
dictionary is created for each \class{DocTest}. If \var{globs} is
|
|
not specified, then it defaults to the module's \var{__dict__}, if
|
|
specified, or \code{\{\}} otherwise. If \var{extraglobs} is not
|
|
specified, then it defaults to \code{\{\}}.
|
|
\end{methoddesc}
|
|
|
|
\subsubsection{DocTestParser objects\label{doctest-DocTestParser}}
|
|
\begin{classdesc}{DocTestParser}{}
|
|
A processing class used to extract interactive examples from a
|
|
string, and use them to create a \class{DocTest} object.
|
|
\versionadded{2.4}
|
|
\end{classdesc}
|
|
|
|
\class{DocTestParser} defines the following methods:
|
|
|
|
\begin{methoddesc}{get_doctest}{string, globs, name, filename, lineno}
|
|
Extract all doctest examples from the given string, and collect
|
|
them into a \class{DocTest} object.
|
|
|
|
\var{globs}, \var{name}, \var{filename}, and \var{lineno} are
|
|
attributes for the new \class{DocTest} object. See the
|
|
documentation for \class{DocTest} for more information.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{get_examples}{string\optional{, name}}
|
|
Extract all doctest examples from the given string, and return
|
|
them as a list of \class{Example} objects. Line numbers are
|
|
0-based. The optional argument \var{name} is a name identifying
|
|
this string, and is only used for error messages.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{parse}{string\optional{, name}}
|
|
Divide the given string into examples and intervening text, and
|
|
return them as a list of alternating \class{Example}s and strings.
|
|
Line numbers for the \class{Example}s are 0-based. The optional
|
|
argument \var{name} is a name identifying this string, and is only
|
|
used for error messages.
|
|
\end{methoddesc}
|
|
|
|
\subsubsection{DocTestRunner objects\label{doctest-DocTestRunner}}
|
|
\begin{classdesc}{DocTestRunner}{\optional{checker}\optional{,
|
|
verbose}\optional{, optionflags}}
|
|
A processing class used to execute and verify the interactive
|
|
examples in a \class{DocTest}.
|
|
|
|
The comparison between expected outputs and actual outputs is done
|
|
by an \class{OutputChecker}. This comparison may be customized
|
|
with a number of option flags; see section~\ref{doctest-options}
|
|
for more information. If the option flags are insufficient, then
|
|
the comparison may also be customized by passing a subclass of
|
|
\class{OutputChecker} to the constructor.
|
|
|
|
The test runner's display output can be controlled in two ways.
|
|
First, an output function can be passed to
|
|
\method{TestRunner.run()}; this function will be called with
|
|
strings that should be displayed. It defaults to
|
|
\code{sys.stdout.write}. If capturing the output is not
|
|
sufficient, then the display output can be also customized by
|
|
subclassing DocTestRunner, and overriding the methods
|
|
\method{report_start}, \method{report_success},
|
|
\method{report_unexpected_exception}, and \method{report_failure}.
|
|
|
|
The optional keyword argument \var{checker} specifies the
|
|
\class{OutputChecker} object (or drop-in replacement) that should
|
|
be used to compare the expected outputs to the actual outputs of
|
|
doctest examples.
|
|
|
|
The optional keyword argument \var{verbose} controls the
|
|
\class{DocTestRunner}'s verbosity. If \var{verbose} is
|
|
\code{True}, then information is printed about each example, as it
|
|
is run. If \var{verbose} is \code{False}, then only failures are
|
|
printed. If \var{verbose} is unspecified, or \code{None}, then
|
|
verbose output is used iff the command-line switch \programopt{-v}
|
|
is used.
|
|
|
|
The optional keyword argument \var{optionflags} can be used to
|
|
control how the test runner compares expected output to actual
|
|
output, and how it displays failures. For more information, see
|
|
section~\ref{doctest-options}.
|
|
|
|
\versionadded{2.4}
|
|
\end{classdesc}
|
|
|
|
\class{DocTestParser} defines the following methods:
|
|
|
|
\begin{methoddesc}{report_start}{out, test, example}
|
|
Report that the test runner is about to process the given example.
|
|
This method is provided to allow subclasses of
|
|
\class{DocTestRunner} to customize their output; it should not be
|
|
called directly.
|
|
|
|
\var{example} is the example about to be processed. \var{test} is
|
|
the test containing \var{example}. \var{out} is the output
|
|
function that was passed to \method{DocTestRunner.run()}.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{report_success}{out, test, example, got}
|
|
Report that the given example ran successfully. This method is
|
|
provided to allow subclasses of \class{DocTestRunner} to customize
|
|
their output; it should not be called directly.
|
|
|
|
\var{example} is the example about to be processed. \var{got} is
|
|
the actual output from the example. \var{test} is the test
|
|
containing \var{example}. \var{out} is the output function that
|
|
was passed to \method{DocTestRunner.run()}.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{report_failure}{out, test, example, got}
|
|
Report that the given example failed. This method is provided to
|
|
allow subclasses of \class{DocTestRunner} to customize their
|
|
output; it should not be called directly.
|
|
|
|
\var{example} is the example about to be processed. \var{got} is
|
|
the actual output from the example. \var{test} is the test
|
|
containing \var{example}. \var{out} is the output function that
|
|
was passed to \method{DocTestRunner.run()}.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{report_unexpected_exception}{out, test, example, exc_info}
|
|
Report that the given example raised an unexpected exception.
|
|
This method is provided to allow subclasses of
|
|
\class{DocTestRunner} to customize their output; it should not be
|
|
called directly.
|
|
|
|
\var{example} is the example about to be processed.
|
|
\var{exc_info} is a tuple containing information about the
|
|
unexpected exception (as returned by \function{sys.exc_info()}).
|
|
\var{test} is the test containing \var{example}. \var{out} is the
|
|
output function that was passed to \method{DocTestRunner.run()}.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{run}{test\optional{, compileflags}\optional{,
|
|
out}\optional{, clear_globs}}
|
|
Run the examples in \var{test} (a \class{DocTest} object), and
|
|
display the results using the writer function \var{out}.
|
|
|
|
The examples are run in the namespace \code{test.globs}. If
|
|
\var{clear_globs} is true (the default), then this namespace will
|
|
be cleared after the test runs, to help with garbage collection.
|
|
If you would like to examine the namespace after the test
|
|
completes, then use \var{clear_globs=False}.
|
|
|
|
\var{compileflags} gives the set of flags that should be used by
|
|
the Python compiler when running the examples. If not specified,
|
|
then it will default to the set of future-import flags that apply
|
|
to \var{globs}.
|
|
|
|
The output of each example is checked using the
|
|
\class{DocTestRunner}'s output checker, and the results are
|
|
formatted by the \method{DocTestRunner.report_*} methods.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{summarize}{\optional{verbose}}
|
|
Print a summary of all the test cases that have been run by this
|
|
DocTestRunner, and return a tuple \samp{(\var{failure_count},
|
|
\var{test_count})}.
|
|
|
|
The optional \var{verbose} argument controls how detailed the
|
|
summary is. If the verbosity is not specified, then the
|
|
\class{DocTestRunner}'s verbosity is used.
|
|
\end{methoddesc}
|
|
|
|
\subsubsection{OutputChecker objects\label{doctest-OutputChecker}}
|
|
|
|
\begin{classdesc}{OutputChecker}{}
|
|
A class used to check the whether the actual output from a doctest
|
|
example matches the expected output. \class{OutputChecker}
|
|
defines two methods: \method{check_output}, which compares a given
|
|
pair of outputs, and returns true if they match; and
|
|
\method{output_difference}, which returns a string describing the
|
|
differences between two outputs.
|
|
\versionadded{2.4}
|
|
\end{classdesc}
|
|
|
|
\class{OutputChecker} defines the following methods:
|
|
|
|
\begin{methoddesc}{check_output}{want, got, optionflags}
|
|
Return \code{True} iff the actual output from an example
|
|
(\var{got}) matches the expected output (\var{want}). These
|
|
strings are always considered to match if they are identical; but
|
|
depending on what option flags the test runner is using, several
|
|
non-exact match types are also possible. See
|
|
section~\ref{doctest-options} for more information about option
|
|
flags.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{output_difference}{example, got, optionflags}
|
|
Return a string describing the differences between the expected
|
|
output for a given example (\var{example}) and the actual output
|
|
(\var{got}). \var{optionflags} is the set of option flags used to
|
|
compare \var{want} and \var{got}.
|
|
\end{methoddesc}
|
|
|
|
\subsection{Debugging\label{doctest-debugging}}
|
|
|
|
Doctest provides several mechanisms for debugging doctest examples:
|
|
|
|
\begin{itemize}
|
|
\item Several functions convert doctests to executable Python
|
|
programs, which can be run under the Python debugger, \refmodule{pdb}.
|
|
\item The \class{DebugRunner} class is a subclass of
|
|
\class{DocTestRunner} that raises an exception for the first
|
|
failing example, containing information about that example.
|
|
This information can be used to perform post-mortem debugging on
|
|
the example.
|
|
\item The \refmodule{unittest} cases generated by \function{DocTestSuite()}
|
|
support the \method{debug()} method defined by
|
|
\class{\refmodule{unittest}.TestCase}.
|
|
\item You can add a call to \function{\refmodule{pdb}.set_trace()} in a
|
|
doctest example, and you'll drop into the Python debugger when that
|
|
line is executed. Then you can inspect current values of variables,
|
|
and so on. For example, suppose \file{a.py} contains just this
|
|
module docstring:
|
|
|
|
\begin{verbatim}
|
|
"""
|
|
>>> def f(x):
|
|
... g(x*2)
|
|
>>> def g(x):
|
|
... print x+3
|
|
... import pdb; pdb.set_trace()
|
|
>>> f(3)
|
|
9
|
|
"""
|
|
\end{verbatim}
|
|
|
|
Then an interactive Python session may look like this:
|
|
|
|
\begin{verbatim}
|
|
>>> import a, doctest
|
|
>>> doctest.testmod(a)
|
|
--Return--
|
|
> <doctest a[1]>(3)g()->None
|
|
-> import pdb; pdb.set_trace()
|
|
(Pdb) list
|
|
1 def g(x):
|
|
2 print x+3
|
|
3 -> import pdb; pdb.set_trace()
|
|
[EOF]
|
|
(Pdb) print x
|
|
6
|
|
(Pdb) step
|
|
--Return--
|
|
> <doctest a[0]>(2)f()->None
|
|
-> g(x*2)
|
|
(Pdb) list
|
|
1 def f(x):
|
|
2 -> g(x*2)
|
|
[EOF]
|
|
(Pdb) print x
|
|
3
|
|
(Pdb) step
|
|
--Return--
|
|
> <doctest a[2]>(1)?()->None
|
|
-> f(3)
|
|
(Pdb) cont
|
|
(0, 3)
|
|
>>>
|
|
\end{verbatim}
|
|
|
|
\versionchanged[The ability to use \function{\refmodule{pdb}.set_trace()}
|
|
usefully inside doctests was added]{2.4}
|
|
\end{itemize}
|
|
|
|
Functions that convert doctests to Python code, and possibly run
|
|
the synthesized code under the debugger:
|
|
|
|
\begin{funcdesc}{script_from_examples}{s}
|
|
Convert text with examples to a script.
|
|
|
|
Argument \var{s} is a string containing doctest examples. The string
|
|
is converted to a Python script, where doctest examples in \var{s}
|
|
are converted to regular code, and everything else is converted to
|
|
Python comments. The generated script is returned as a string.
|
|
For example,
|
|
|
|
\begin{verbatim}
|
|
import doctest
|
|
print doctest.script_from_examples(r"""
|
|
Set x and y to 1 and 2.
|
|
>>> x, y = 1, 2
|
|
|
|
Print their sum:
|
|
>>> print x+y
|
|
3
|
|
""")
|
|
\end{verbatim}
|
|
|
|
displays:
|
|
|
|
\begin{verbatim}
|
|
# Set x and y to 1 and 2.
|
|
x, y = 1, 2
|
|
#
|
|
# Print their sum:
|
|
print x+y
|
|
# Expected:
|
|
## 3
|
|
\end{verbatim}
|
|
|
|
This function is used internally by other functions (see below), but
|
|
can also be useful when you want to transform an interactive Python
|
|
session into a Python script.
|
|
|
|
\versionadded{2.4}
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{testsource}{module, name}
|
|
Convert the doctest for an object to a script.
|
|
|
|
Argument \var{module} is a module object, or dotted name of a module,
|
|
containing the object whose doctests are of interest. Argument
|
|
\var{name} is the name (within the module) of the object with the
|
|
doctests of interest. The result is a string, containing the
|
|
object's docstring converted to a Python script, as described for
|
|
\function{script_from_examples()} above. For example, if module
|
|
\file{a.py} contains a top-level function \function{f()}, then
|
|
|
|
\begin{verbatim}
|
|
import a, doctest
|
|
print doctest.testsource(a, "a.f")
|
|
\end{verbatim}
|
|
|
|
prints a script version of function \function{f()}'s docstring,
|
|
with doctests converted to code, and the rest placed in comments.
|
|
|
|
\versionadded{2.3}
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{debug}{module, name\optional{, pm}}
|
|
Debug the doctests for an object.
|
|
|
|
The \var{module} and \var{name} arguments are the same as for function
|
|
\function{testsource()} above. The synthesized Python script for the
|
|
named object's docstring is written to a temporary file, and then that
|
|
file is run under the control of the Python debugger, \refmodule{pdb}.
|
|
|
|
A shallow copy of \code{\var{module}.__dict__} is used for both local
|
|
and global execution context.
|
|
|
|
Optional argument \var{pm} controls whether post-mortem debugging is
|
|
used. If \var{pm} has a true value, the script file is run directly, and
|
|
the debugger gets involved only if the script terminates via raising an
|
|
unhandled exception. If it does, then post-mortem debugging is invoked,
|
|
via \function{\refmodule{pdb}.post_mortem()}, passing the traceback object
|
|
from the unhandled exception. If \var{pm} is not specified, or is false,
|
|
the script is run under the debugger from the start, via passing an
|
|
appropriate \function{execfile()} call to \function{\refmodule{pdb}.run()}.
|
|
|
|
\versionadded{2.3}
|
|
|
|
\versionchanged[The \var{pm} argument was added]{2.4}
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{debug_src}{src\optional{, pm}\optional{, globs}}
|
|
Debug the doctests in a string.
|
|
|
|
This is like function \function{debug()} above, except that
|
|
a string containing doctest examples is specified directly, via
|
|
the \var{src} argument.
|
|
|
|
Optional argument \var{pm} has the same meaning as in function
|
|
\function{debug()} above.
|
|
|
|
Optional argument \var{globs} gives a dictionary to use as both
|
|
local and global execution context. If not specified, or \code{None},
|
|
an empty dictionary is used. If specified, a shallow copy of the
|
|
dictionary is used.
|
|
|
|
\versionadded{2.4}
|
|
\end{funcdesc}
|
|
|
|
The \class{DebugRunner} class, and the special exceptions it may raise,
|
|
are of most interest to testing framework authors, and will only be
|
|
sketched here. See the source code, and especially \class{DebugRunner}'s
|
|
docstring (which is a doctest!) for more details:
|
|
|
|
\begin{classdesc}{DebugRunner}{\optional{checker}\optional{,
|
|
verbose}\optional{, optionflags}}
|
|
|
|
A subclass of \class{DocTestRunner} that raises an exception as
|
|
soon as a failure is encountered. If an unexpected exception
|
|
occurs, an \exception{UnexpectedException} exception is raised,
|
|
containing the test, the example, and the original exception. If
|
|
the output doesn't match, then a \exception{DocTestFailure}
|
|
exception is raised, containing the test, the example, and the
|
|
actual output.
|
|
|
|
For information about the constructor parameters and methods, see
|
|
the documentation for \class{DocTestRunner} in
|
|
section~\ref{doctest-advanced-api}.
|
|
\end{classdesc}
|
|
|
|
There are two exceptions that may be raised by \class{DebugRunner}
|
|
instances:
|
|
|
|
\begin{excclassdesc}{DocTestFailure}{test, example, got}
|
|
An exception thrown by \class{DocTestRunner} to signal that a
|
|
doctest example's actual output did not match its expected output.
|
|
The constructor arguments are used to initialize the member
|
|
variables of the same names.
|
|
\end{excclassdesc}
|
|
\exception{DocTestFailure} defines the following member variables:
|
|
\begin{memberdesc}{test}
|
|
The \class{DocTest} object that was being run when the example failed.
|
|
\end{memberdesc}
|
|
\begin{memberdesc}{example}
|
|
The \class{Example} that failed.
|
|
\end{memberdesc}
|
|
\begin{memberdesc}{got}
|
|
The example's actual output.
|
|
\end{memberdesc}
|
|
|
|
\begin{excclassdesc}{UnexpectedException}{test, example, exc_info}
|
|
An exception thrown by \class{DocTestRunner} to signal that a
|
|
doctest example raised an unexpected exception. The constructor
|
|
arguments are used to initialize the member variables of the same
|
|
names.
|
|
\end{excclassdesc}
|
|
\exception{UnexpectedException} defines the following member variables:
|
|
\begin{memberdesc}{test}
|
|
The \class{DocTest} object that was being run when the example failed.
|
|
\end{memberdesc}
|
|
\begin{memberdesc}{example}
|
|
The \class{Example} that failed.
|
|
\end{memberdesc}
|
|
\begin{memberdesc}{exc_info}
|
|
A tuple containing information about the unexpected exception, as
|
|
returned by \function{sys.exc_info()}.
|
|
\end{memberdesc}
|
|
|
|
\subsection{Soapbox\label{doctest-soapbox}}
|
|
|
|
As mentioned in the introduction, \refmodule{doctest} has grown to have
|
|
three primary uses:
|
|
|
|
\begin{enumerate}
|
|
\item Checking examples in docstrings.
|
|
\item Regression testing.
|
|
\item Executable documentation / literate testing.
|
|
\end{enumerate}
|
|
|
|
These uses have different requirements, and it is important to
|
|
distinguish them. In particular, filling your docstrings with obscure
|
|
test cases makes for bad documentation.
|
|
|
|
When writing a docstring, choose docstring examples with care.
|
|
There's an art to this that needs to be learned---it may not be
|
|
natural at first. Examples should add genuine value to the
|
|
documentation. A good example can often be worth many words.
|
|
If done with care, the examples will be invaluable for your users, and
|
|
will pay back the time it takes to collect them many times over as the
|
|
years go by and things change. I'm still amazed at how often one of
|
|
my \refmodule{doctest} examples stops working after a "harmless"
|
|
change.
|
|
|
|
Doctest also makes an excellent tool for regression testing, especially if
|
|
you don't skimp on explanatory text. By interleaving prose and examples,
|
|
it becomes much easier to keep track of what's actually being tested, and
|
|
why. When a test fails, good prose can make it much easier to figure out
|
|
what the problem is, and how it should be fixed. It's true that you could
|
|
write extensive comments in code-based testing, but few programmers do.
|
|
Many have found that using doctest approaches instead leads to much clearer
|
|
tests. Perhaps this is simply because doctest makes writing prose a little
|
|
easier than writing code, while writing comments in code is a little
|
|
harder. I think it goes deeper than just that: the natural attitude
|
|
when writing a doctest-based test is that you want to explain the fine
|
|
points of your software, and illustrate them with examples. This in
|
|
turn naturally leads to test files that start with the simplest features,
|
|
and logically progress to complications and edge cases. A coherent
|
|
narrative is the result, instead of a collection of isolated functions
|
|
that test isolated bits of functionality seemingly at random. It's
|
|
a different attitude, and produces different results, blurring the
|
|
distinction between testing and explaining.
|
|
|
|
Regression testing is best confined to dedicated objects or files. There
|
|
are several options for organizing tests:
|
|
|
|
\begin{itemize}
|
|
\item Write text files containing test cases as interactive examples,
|
|
and test the files using \function{testfile()} or
|
|
\function{DocFileSuite()}. This is recommended, although is
|
|
easiest to do for new projects, designed from the start to use
|
|
doctest.
|
|
\item Define functions named \code{_regrtest_\textit{topic}} that
|
|
consist of single docstrings, containing test cases for the
|
|
named topics. These functions can be included in the same file
|
|
as the module, or separated out into a separate test file.
|
|
\item Define a \code{__test__} dictionary mapping from regression test
|
|
topics to docstrings containing test cases.
|
|
\end{itemize}
|