mirror of
https://github.com/python/cpython
synced 2024-09-22 15:23:50 +00:00
d8faa3654c
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. ........
2648 lines
96 KiB
Python
2648 lines
96 KiB
Python
# Module doctest.
|
|
# Released to the public domain 16-Jan-2001, by Tim Peters (tim@python.org).
|
|
# Major enhancements and refactoring by:
|
|
# Jim Fulton
|
|
# Edward Loper
|
|
|
|
# Provided as-is; use at your own risk; no warranty; no promises; enjoy!
|
|
|
|
r"""Module doctest -- a framework for running examples in docstrings.
|
|
|
|
In simplest use, end each module M to be tested with:
|
|
|
|
def _test():
|
|
import doctest
|
|
doctest.testmod()
|
|
|
|
if __name__ == "__main__":
|
|
_test()
|
|
|
|
Then running the module as a script will cause the examples in the
|
|
docstrings to get executed and verified:
|
|
|
|
python M.py
|
|
|
|
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
|
|
(why not stderr? because stderr is a lame hack <0.2 wink>), and the final
|
|
line of output is "Test failed.".
|
|
|
|
Run it with the -v switch instead:
|
|
|
|
python M.py -v
|
|
|
|
and a detailed report of all examples tried is printed to stdout, along
|
|
with assorted summaries at the end.
|
|
|
|
You can force verbose mode by passing "verbose=True" to testmod, or prohibit
|
|
it by passing "verbose=False". In either of those cases, sys.argv is not
|
|
examined by testmod.
|
|
|
|
There are a variety of other ways to run doctests, including integration
|
|
with the unittest framework, and support for running non-Python text
|
|
files containing doctests. There are also many ways to override parts
|
|
of doctest's default behaviors. See the Library Reference Manual for
|
|
details.
|
|
"""
|
|
|
|
__docformat__ = 'reStructuredText en'
|
|
|
|
__all__ = [
|
|
# 0, Option Flags
|
|
'register_optionflag',
|
|
'DONT_ACCEPT_TRUE_FOR_1',
|
|
'DONT_ACCEPT_BLANKLINE',
|
|
'NORMALIZE_WHITESPACE',
|
|
'ELLIPSIS',
|
|
'SKIP',
|
|
'IGNORE_EXCEPTION_DETAIL',
|
|
'COMPARISON_FLAGS',
|
|
'REPORT_UDIFF',
|
|
'REPORT_CDIFF',
|
|
'REPORT_NDIFF',
|
|
'REPORT_ONLY_FIRST_FAILURE',
|
|
'REPORTING_FLAGS',
|
|
# 1. Utility Functions
|
|
# 2. Example & DocTest
|
|
'Example',
|
|
'DocTest',
|
|
# 3. Doctest Parser
|
|
'DocTestParser',
|
|
# 4. Doctest Finder
|
|
'DocTestFinder',
|
|
# 5. Doctest Runner
|
|
'DocTestRunner',
|
|
'OutputChecker',
|
|
'DocTestFailure',
|
|
'UnexpectedException',
|
|
'DebugRunner',
|
|
# 6. Test Functions
|
|
'testmod',
|
|
'testfile',
|
|
'run_docstring_examples',
|
|
# 7. Tester
|
|
'Tester',
|
|
# 8. Unittest Support
|
|
'DocTestSuite',
|
|
'DocFileSuite',
|
|
'set_unittest_reportflags',
|
|
# 9. Debugging Support
|
|
'script_from_examples',
|
|
'testsource',
|
|
'debug_src',
|
|
'debug',
|
|
]
|
|
|
|
import __future__
|
|
|
|
import sys, traceback, inspect, linecache, os, re
|
|
import unittest, difflib, pdb, tempfile
|
|
import warnings
|
|
from StringIO import StringIO
|
|
|
|
# There are 4 basic classes:
|
|
# - Example: a <source, want> pair, plus an intra-docstring line number.
|
|
# - DocTest: a collection of examples, parsed from a docstring, plus
|
|
# info about where the docstring came from (name, filename, lineno).
|
|
# - DocTestFinder: extracts DocTests from a given object's docstring and
|
|
# its contained objects' docstrings.
|
|
# - DocTestRunner: runs DocTest cases, and accumulates statistics.
|
|
#
|
|
# So the basic picture is:
|
|
#
|
|
# list of:
|
|
# +------+ +---------+ +-------+
|
|
# |object| --DocTestFinder-> | DocTest | --DocTestRunner-> |results|
|
|
# +------+ +---------+ +-------+
|
|
# | Example |
|
|
# | ... |
|
|
# | Example |
|
|
# +---------+
|
|
|
|
# Option constants.
|
|
|
|
OPTIONFLAGS_BY_NAME = {}
|
|
def register_optionflag(name):
|
|
# Create a new flag unless `name` is already known.
|
|
return OPTIONFLAGS_BY_NAME.setdefault(name, 1 << len(OPTIONFLAGS_BY_NAME))
|
|
|
|
DONT_ACCEPT_TRUE_FOR_1 = register_optionflag('DONT_ACCEPT_TRUE_FOR_1')
|
|
DONT_ACCEPT_BLANKLINE = register_optionflag('DONT_ACCEPT_BLANKLINE')
|
|
NORMALIZE_WHITESPACE = register_optionflag('NORMALIZE_WHITESPACE')
|
|
ELLIPSIS = register_optionflag('ELLIPSIS')
|
|
SKIP = register_optionflag('SKIP')
|
|
IGNORE_EXCEPTION_DETAIL = register_optionflag('IGNORE_EXCEPTION_DETAIL')
|
|
|
|
COMPARISON_FLAGS = (DONT_ACCEPT_TRUE_FOR_1 |
|
|
DONT_ACCEPT_BLANKLINE |
|
|
NORMALIZE_WHITESPACE |
|
|
ELLIPSIS |
|
|
SKIP |
|
|
IGNORE_EXCEPTION_DETAIL)
|
|
|
|
REPORT_UDIFF = register_optionflag('REPORT_UDIFF')
|
|
REPORT_CDIFF = register_optionflag('REPORT_CDIFF')
|
|
REPORT_NDIFF = register_optionflag('REPORT_NDIFF')
|
|
REPORT_ONLY_FIRST_FAILURE = register_optionflag('REPORT_ONLY_FIRST_FAILURE')
|
|
|
|
REPORTING_FLAGS = (REPORT_UDIFF |
|
|
REPORT_CDIFF |
|
|
REPORT_NDIFF |
|
|
REPORT_ONLY_FIRST_FAILURE)
|
|
|
|
# Special string markers for use in `want` strings:
|
|
BLANKLINE_MARKER = '<BLANKLINE>'
|
|
ELLIPSIS_MARKER = '...'
|
|
|
|
######################################################################
|
|
## Table of Contents
|
|
######################################################################
|
|
# 1. Utility Functions
|
|
# 2. Example & DocTest -- store test cases
|
|
# 3. DocTest Parser -- extracts examples from strings
|
|
# 4. DocTest Finder -- extracts test cases from objects
|
|
# 5. DocTest Runner -- runs test cases
|
|
# 6. Test Functions -- convenient wrappers for testing
|
|
# 7. Tester Class -- for backwards compatibility
|
|
# 8. Unittest Support
|
|
# 9. Debugging Support
|
|
# 10. Example Usage
|
|
|
|
######################################################################
|
|
## 1. Utility Functions
|
|
######################################################################
|
|
|
|
def _extract_future_flags(globs):
|
|
"""
|
|
Return the compiler-flags associated with the future features that
|
|
have been imported into the given namespace (globs).
|
|
"""
|
|
flags = 0
|
|
for fname in __future__.all_feature_names:
|
|
feature = globs.get(fname, None)
|
|
if feature is getattr(__future__, fname):
|
|
flags |= feature.compiler_flag
|
|
return flags
|
|
|
|
def _normalize_module(module, depth=2):
|
|
"""
|
|
Return the module specified by `module`. In particular:
|
|
- If `module` is a module, then return module.
|
|
- If `module` is a string, then import and return the
|
|
module with that name.
|
|
- If `module` is None, then return the calling module.
|
|
The calling module is assumed to be the module of
|
|
the stack frame at the given depth in the call stack.
|
|
"""
|
|
if inspect.ismodule(module):
|
|
return module
|
|
elif isinstance(module, (str, unicode)):
|
|
return __import__(module, globals(), locals(), ["*"])
|
|
elif module is None:
|
|
return sys.modules[sys._getframe(depth).f_globals['__name__']]
|
|
else:
|
|
raise TypeError("Expected a module, string, or None")
|
|
|
|
def _load_testfile(filename, package, module_relative):
|
|
if module_relative:
|
|
package = _normalize_module(package, 3)
|
|
filename = _module_relative_path(package, filename)
|
|
if hasattr(package, '__loader__'):
|
|
if hasattr(package.__loader__, 'get_data'):
|
|
return package.__loader__.get_data(filename), filename
|
|
return open(filename).read(), filename
|
|
|
|
def _indent(s, indent=4):
|
|
"""
|
|
Add the given number of space characters to the beginning every
|
|
non-blank line in `s`, and return the result.
|
|
"""
|
|
# This regexp matches the start of non-blank lines:
|
|
return re.sub('(?m)^(?!$)', indent*' ', s)
|
|
|
|
def _exception_traceback(exc_info):
|
|
"""
|
|
Return a string containing a traceback message for the given
|
|
exc_info tuple (as returned by sys.exc_info()).
|
|
"""
|
|
# Get a traceback message.
|
|
excout = StringIO()
|
|
exc_type, exc_val, exc_tb = exc_info
|
|
traceback.print_exception(exc_type, exc_val, exc_tb, file=excout)
|
|
return excout.getvalue()
|
|
|
|
# Override some StringIO methods.
|
|
class _SpoofOut(StringIO):
|
|
def getvalue(self):
|
|
result = StringIO.getvalue(self)
|
|
# If anything at all was written, make sure there's a trailing
|
|
# newline. There's no way for the expected output to indicate
|
|
# that a trailing newline is missing.
|
|
if result and not result.endswith("\n"):
|
|
result += "\n"
|
|
return result
|
|
|
|
def truncate(self, size=None):
|
|
StringIO.truncate(self, size)
|
|
|
|
# Worst-case linear-time ellipsis matching.
|
|
def _ellipsis_match(want, got):
|
|
"""
|
|
Essentially the only subtle case:
|
|
>>> _ellipsis_match('aa...aa', 'aaa')
|
|
False
|
|
"""
|
|
if ELLIPSIS_MARKER not in want:
|
|
return want == got
|
|
|
|
# Find "the real" strings.
|
|
ws = want.split(ELLIPSIS_MARKER)
|
|
assert len(ws) >= 2
|
|
|
|
# Deal with exact matches possibly needed at one or both ends.
|
|
startpos, endpos = 0, len(got)
|
|
w = ws[0]
|
|
if w: # starts with exact match
|
|
if got.startswith(w):
|
|
startpos = len(w)
|
|
del ws[0]
|
|
else:
|
|
return False
|
|
w = ws[-1]
|
|
if w: # ends with exact match
|
|
if got.endswith(w):
|
|
endpos -= len(w)
|
|
del ws[-1]
|
|
else:
|
|
return False
|
|
|
|
if startpos > endpos:
|
|
# Exact end matches required more characters than we have, as in
|
|
# _ellipsis_match('aa...aa', 'aaa')
|
|
return False
|
|
|
|
# For the rest, we only need to find the leftmost non-overlapping
|
|
# match for each piece. If there's no overall match that way alone,
|
|
# there's no overall match period.
|
|
for w in ws:
|
|
# w may be '' at times, if there are consecutive ellipses, or
|
|
# due to an ellipsis at the start or end of `want`. That's OK.
|
|
# Search for an empty string succeeds, and doesn't change startpos.
|
|
startpos = got.find(w, startpos, endpos)
|
|
if startpos < 0:
|
|
return False
|
|
startpos += len(w)
|
|
|
|
return True
|
|
|
|
def _comment_line(line):
|
|
"Return a commented form of the given line"
|
|
line = line.rstrip()
|
|
if line:
|
|
return '# '+line
|
|
else:
|
|
return '#'
|
|
|
|
class _OutputRedirectingPdb(pdb.Pdb):
|
|
"""
|
|
A specialized version of the python debugger that redirects stdout
|
|
to a given stream when interacting with the user. Stdout is *not*
|
|
redirected when traced code is executed.
|
|
"""
|
|
def __init__(self, out):
|
|
self.__out = out
|
|
pdb.Pdb.__init__(self, stdout=out)
|
|
|
|
def trace_dispatch(self, *args):
|
|
# Redirect stdout to the given stream.
|
|
save_stdout = sys.stdout
|
|
sys.stdout = self.__out
|
|
# Call Pdb's trace dispatch method.
|
|
try:
|
|
return pdb.Pdb.trace_dispatch(self, *args)
|
|
finally:
|
|
sys.stdout = save_stdout
|
|
|
|
# [XX] Normalize with respect to os.path.pardir?
|
|
def _module_relative_path(module, path):
|
|
if not inspect.ismodule(module):
|
|
raise TypeError, 'Expected a module: %r' % module
|
|
if path.startswith('/'):
|
|
raise ValueError, 'Module-relative files may not have absolute paths'
|
|
|
|
# Find the base directory for the path.
|
|
if hasattr(module, '__file__'):
|
|
# A normal module/package
|
|
basedir = os.path.split(module.__file__)[0]
|
|
elif module.__name__ == '__main__':
|
|
# An interactive session.
|
|
if len(sys.argv)>0 and sys.argv[0] != '':
|
|
basedir = os.path.split(sys.argv[0])[0]
|
|
else:
|
|
basedir = os.curdir
|
|
else:
|
|
# A module w/o __file__ (this includes builtins)
|
|
raise ValueError("Can't resolve paths relative to the module " +
|
|
module + " (it has no __file__)")
|
|
|
|
# Combine the base directory and the path.
|
|
return os.path.join(basedir, *(path.split('/')))
|
|
|
|
######################################################################
|
|
## 2. Example & DocTest
|
|
######################################################################
|
|
## - An "example" is a <source, want> pair, where "source" is a
|
|
## fragment of source code, and "want" is the expected output for
|
|
## "source." The Example class also includes information about
|
|
## where the example was extracted from.
|
|
##
|
|
## - A "doctest" is a collection of examples, typically extracted from
|
|
## a string (such as an object's docstring). The DocTest class also
|
|
## includes information about where the string was extracted from.
|
|
|
|
class Example:
|
|
"""
|
|
A single doctest example, consisting of source code and expected
|
|
output. `Example` defines the following attributes:
|
|
|
|
- source: A single Python statement, always ending with a newline.
|
|
The constructor adds a newline if needed.
|
|
|
|
- want: The expected output from running the source code (either
|
|
from stdout, or a traceback in case of exception). `want` ends
|
|
with a newline unless it's empty, in which case it's an empty
|
|
string. The constructor adds a newline if needed.
|
|
|
|
- exc_msg: The exception message generated by the example, if
|
|
the example is expected to generate an exception; or `None` if
|
|
it is not expected to generate an exception. This exception
|
|
message is compared against the return value of
|
|
`traceback.format_exception_only()`. `exc_msg` ends with a
|
|
newline unless it's `None`. The constructor adds a newline
|
|
if needed.
|
|
|
|
- lineno: The line number within the DocTest string containing
|
|
this Example where the Example begins. This line number is
|
|
zero-based, with respect to the beginning of the DocTest.
|
|
|
|
- indent: The example's indentation in the DocTest string.
|
|
I.e., the number of space characters that preceed the
|
|
example's first prompt.
|
|
|
|
- options: A dictionary mapping from option flags to True or
|
|
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
|
|
DocTestRunner's optionflags). By default, no options are set.
|
|
"""
|
|
def __init__(self, source, want, exc_msg=None, lineno=0, indent=0,
|
|
options=None):
|
|
# Normalize inputs.
|
|
if not source.endswith('\n'):
|
|
source += '\n'
|
|
if want and not want.endswith('\n'):
|
|
want += '\n'
|
|
if exc_msg is not None and not exc_msg.endswith('\n'):
|
|
exc_msg += '\n'
|
|
# Store properties.
|
|
self.source = source
|
|
self.want = want
|
|
self.lineno = lineno
|
|
self.indent = indent
|
|
if options is None: options = {}
|
|
self.options = options
|
|
self.exc_msg = exc_msg
|
|
|
|
class DocTest:
|
|
"""
|
|
A collection of doctest examples that should be run in a single
|
|
namespace. Each `DocTest` defines the following attributes:
|
|
|
|
- examples: the list of examples.
|
|
|
|
- globs: The namespace (aka globals) that the examples should
|
|
be run in.
|
|
|
|
- name: A name identifying the DocTest (typically, the name of
|
|
the object whose docstring this DocTest was extracted from).
|
|
|
|
- filename: The name of the file that this DocTest was extracted
|
|
from, or `None` if the filename is unknown.
|
|
|
|
- lineno: The line number within filename where this DocTest
|
|
begins, or `None` if the line number is unavailable. This
|
|
line number is zero-based, with respect to the beginning of
|
|
the file.
|
|
|
|
- docstring: The string that the examples were extracted from,
|
|
or `None` if the string is unavailable.
|
|
"""
|
|
def __init__(self, examples, globs, name, filename, lineno, docstring):
|
|
"""
|
|
Create a new DocTest containing the given examples. The
|
|
DocTest's globals are initialized with a copy of `globs`.
|
|
"""
|
|
assert not isinstance(examples, basestring), \
|
|
"DocTest no longer accepts str; use DocTestParser instead"
|
|
self.examples = examples
|
|
self.docstring = docstring
|
|
self.globs = globs.copy()
|
|
self.name = name
|
|
self.filename = filename
|
|
self.lineno = lineno
|
|
|
|
def __repr__(self):
|
|
if len(self.examples) == 0:
|
|
examples = 'no examples'
|
|
elif len(self.examples) == 1:
|
|
examples = '1 example'
|
|
else:
|
|
examples = '%d examples' % len(self.examples)
|
|
return ('<DocTest %s from %s:%s (%s)>' %
|
|
(self.name, self.filename, self.lineno, examples))
|
|
|
|
|
|
# This lets us sort tests by name:
|
|
def __lt__(self, other):
|
|
if not isinstance(other, DocTest):
|
|
return NotImplemented
|
|
return ((self.name, self.filename, self.lineno, id(self))
|
|
<
|
|
(other.name, other.filename, other.lineno, id(other)))
|
|
|
|
######################################################################
|
|
## 3. DocTestParser
|
|
######################################################################
|
|
|
|
class DocTestParser:
|
|
"""
|
|
A class used to parse strings containing doctest examples.
|
|
"""
|
|
# This regular expression is used to find doctest examples in a
|
|
# string. It defines three groups: `source` is the source code
|
|
# (including leading indentation and prompts); `indent` is the
|
|
# indentation of the first (PS1) line of the source code; and
|
|
# `want` is the expected output (including leading indentation).
|
|
_EXAMPLE_RE = re.compile(r'''
|
|
# Source consists of a PS1 line followed by zero or more PS2 lines.
|
|
(?P<source>
|
|
(?:^(?P<indent> [ ]*) >>> .*) # PS1 line
|
|
(?:\n [ ]* \.\.\. .*)*) # PS2 lines
|
|
\n?
|
|
# Want consists of any non-blank lines that do not start with PS1.
|
|
(?P<want> (?:(?![ ]*$) # Not a blank line
|
|
(?![ ]*>>>) # Not a line starting with PS1
|
|
.*$\n? # But any other line
|
|
)*)
|
|
''', re.MULTILINE | re.VERBOSE)
|
|
|
|
# A regular expression for handling `want` strings that contain
|
|
# expected exceptions. It divides `want` into three pieces:
|
|
# - the traceback header line (`hdr`)
|
|
# - the traceback stack (`stack`)
|
|
# - the exception message (`msg`), as generated by
|
|
# traceback.format_exception_only()
|
|
# `msg` may have multiple lines. We assume/require that the
|
|
# exception message is the first non-indented line starting with a word
|
|
# character following the traceback header line.
|
|
_EXCEPTION_RE = re.compile(r"""
|
|
# Grab the traceback header. Different versions of Python have
|
|
# said different things on the first traceback line.
|
|
^(?P<hdr> Traceback\ \(
|
|
(?: most\ recent\ call\ last
|
|
| innermost\ last
|
|
) \) :
|
|
)
|
|
\s* $ # toss trailing whitespace on the header.
|
|
(?P<stack> .*?) # don't blink: absorb stuff until...
|
|
^ (?P<msg> \w+ .*) # a line *starts* with alphanum.
|
|
""", re.VERBOSE | re.MULTILINE | re.DOTALL)
|
|
|
|
# A callable returning a true value iff its argument is a blank line
|
|
# or contains a single comment.
|
|
_IS_BLANK_OR_COMMENT = re.compile(r'^[ ]*(#.*)?$').match
|
|
|
|
def parse(self, string, name='<string>'):
|
|
"""
|
|
Divide the given string into examples and intervening text,
|
|
and return them as a list of alternating Examples and strings.
|
|
Line numbers for the Examples are 0-based. The optional
|
|
argument `name` is a name identifying this string, and is only
|
|
used for error messages.
|
|
"""
|
|
string = string.expandtabs()
|
|
# If all lines begin with the same indentation, then strip it.
|
|
min_indent = self._min_indent(string)
|
|
if min_indent > 0:
|
|
string = '\n'.join([l[min_indent:] for l in string.split('\n')])
|
|
|
|
output = []
|
|
charno, lineno = 0, 0
|
|
# Find all doctest examples in the string:
|
|
for m in self._EXAMPLE_RE.finditer(string):
|
|
# Add the pre-example text to `output`.
|
|
output.append(string[charno:m.start()])
|
|
# Update lineno (lines before this example)
|
|
lineno += string.count('\n', charno, m.start())
|
|
# Extract info from the regexp match.
|
|
(source, options, want, exc_msg) = \
|
|
self._parse_example(m, name, lineno)
|
|
# Create an Example, and add it to the list.
|
|
if not self._IS_BLANK_OR_COMMENT(source):
|
|
output.append( Example(source, want, exc_msg,
|
|
lineno=lineno,
|
|
indent=min_indent+len(m.group('indent')),
|
|
options=options) )
|
|
# Update lineno (lines inside this example)
|
|
lineno += string.count('\n', m.start(), m.end())
|
|
# Update charno.
|
|
charno = m.end()
|
|
# Add any remaining post-example text to `output`.
|
|
output.append(string[charno:])
|
|
return output
|
|
|
|
def get_doctest(self, string, globs, name, filename, lineno):
|
|
"""
|
|
Extract all doctest examples from the given string, and
|
|
collect them into a `DocTest` object.
|
|
|
|
`globs`, `name`, `filename`, and `lineno` are attributes for
|
|
the new `DocTest` object. See the documentation for `DocTest`
|
|
for more information.
|
|
"""
|
|
return DocTest(self.get_examples(string, name), globs,
|
|
name, filename, lineno, string)
|
|
|
|
def get_examples(self, string, name='<string>'):
|
|
"""
|
|
Extract all doctest examples from the given string, and return
|
|
them as a list of `Example` objects. Line numbers are
|
|
0-based, because it's most common in doctests that nothing
|
|
interesting appears on the same line as opening triple-quote,
|
|
and so the first interesting line is called \"line 1\" then.
|
|
|
|
The optional argument `name` is a name identifying this
|
|
string, and is only used for error messages.
|
|
"""
|
|
return [x for x in self.parse(string, name)
|
|
if isinstance(x, Example)]
|
|
|
|
def _parse_example(self, m, name, lineno):
|
|
"""
|
|
Given a regular expression match from `_EXAMPLE_RE` (`m`),
|
|
return a pair `(source, want)`, where `source` is the matched
|
|
example's source code (with prompts and indentation stripped);
|
|
and `want` is the example's expected output (with indentation
|
|
stripped).
|
|
|
|
`name` is the string's name, and `lineno` is the line number
|
|
where the example starts; both are used for error messages.
|
|
"""
|
|
# Get the example's indentation level.
|
|
indent = len(m.group('indent'))
|
|
|
|
# Divide source into lines; check that they're properly
|
|
# indented; and then strip their indentation & prompts.
|
|
source_lines = m.group('source').split('\n')
|
|
self._check_prompt_blank(source_lines, indent, name, lineno)
|
|
self._check_prefix(source_lines[1:], ' '*indent + '.', name, lineno)
|
|
source = '\n'.join([sl[indent+4:] for sl in source_lines])
|
|
|
|
# Divide want into lines; check that it's properly indented; and
|
|
# then strip the indentation. Spaces before the last newline should
|
|
# be preserved, so plain rstrip() isn't good enough.
|
|
want = m.group('want')
|
|
want_lines = want.split('\n')
|
|
if len(want_lines) > 1 and re.match(r' *$', want_lines[-1]):
|
|
del want_lines[-1] # forget final newline & spaces after it
|
|
self._check_prefix(want_lines, ' '*indent, name,
|
|
lineno + len(source_lines))
|
|
want = '\n'.join([wl[indent:] for wl in want_lines])
|
|
|
|
# If `want` contains a traceback message, then extract it.
|
|
m = self._EXCEPTION_RE.match(want)
|
|
if m:
|
|
exc_msg = m.group('msg')
|
|
else:
|
|
exc_msg = None
|
|
|
|
# Extract options from the source.
|
|
options = self._find_options(source, name, lineno)
|
|
|
|
return source, options, want, exc_msg
|
|
|
|
# This regular expression looks for option directives in the
|
|
# source code of an example. Option directives are comments
|
|
# starting with "doctest:". Warning: this may give false
|
|
# positives for string-literals that contain the string
|
|
# "#doctest:". Eliminating these false positives would require
|
|
# actually parsing the string; but we limit them by ignoring any
|
|
# line containing "#doctest:" that is *followed* by a quote mark.
|
|
_OPTION_DIRECTIVE_RE = re.compile(r'#\s*doctest:\s*([^\n\'"]*)$',
|
|
re.MULTILINE)
|
|
|
|
def _find_options(self, source, name, lineno):
|
|
"""
|
|
Return a dictionary containing option overrides extracted from
|
|
option directives in the given source string.
|
|
|
|
`name` is the string's name, and `lineno` is the line number
|
|
where the example starts; both are used for error messages.
|
|
"""
|
|
options = {}
|
|
# (note: with the current regexp, this will match at most once:)
|
|
for m in self._OPTION_DIRECTIVE_RE.finditer(source):
|
|
option_strings = m.group(1).replace(',', ' ').split()
|
|
for option in option_strings:
|
|
if (option[0] not in '+-' or
|
|
option[1:] not in OPTIONFLAGS_BY_NAME):
|
|
raise ValueError('line %r of the doctest for %s '
|
|
'has an invalid option: %r' %
|
|
(lineno+1, name, option))
|
|
flag = OPTIONFLAGS_BY_NAME[option[1:]]
|
|
options[flag] = (option[0] == '+')
|
|
if options and self._IS_BLANK_OR_COMMENT(source):
|
|
raise ValueError('line %r of the doctest for %s has an option '
|
|
'directive on a line with no example: %r' %
|
|
(lineno, name, source))
|
|
return options
|
|
|
|
# This regular expression finds the indentation of every non-blank
|
|
# line in a string.
|
|
_INDENT_RE = re.compile('^([ ]*)(?=\S)', re.MULTILINE)
|
|
|
|
def _min_indent(self, s):
|
|
"Return the minimum indentation of any non-blank line in `s`"
|
|
indents = [len(indent) for indent in self._INDENT_RE.findall(s)]
|
|
if len(indents) > 0:
|
|
return min(indents)
|
|
else:
|
|
return 0
|
|
|
|
def _check_prompt_blank(self, lines, indent, name, lineno):
|
|
"""
|
|
Given the lines of a source string (including prompts and
|
|
leading indentation), check to make sure that every prompt is
|
|
followed by a space character. If any line is not followed by
|
|
a space character, then raise ValueError.
|
|
"""
|
|
for i, line in enumerate(lines):
|
|
if len(line) >= indent+4 and line[indent+3] != ' ':
|
|
raise ValueError('line %r of the docstring for %s '
|
|
'lacks blank after %s: %r' %
|
|
(lineno+i+1, name,
|
|
line[indent:indent+3], line))
|
|
|
|
def _check_prefix(self, lines, prefix, name, lineno):
|
|
"""
|
|
Check that every line in the given list starts with the given
|
|
prefix; if any line does not, then raise a ValueError.
|
|
"""
|
|
for i, line in enumerate(lines):
|
|
if line and not line.startswith(prefix):
|
|
raise ValueError('line %r of the docstring for %s has '
|
|
'inconsistent leading whitespace: %r' %
|
|
(lineno+i+1, name, line))
|
|
|
|
|
|
######################################################################
|
|
## 4. DocTest Finder
|
|
######################################################################
|
|
|
|
class DocTestFinder:
|
|
"""
|
|
A class used to extract the DocTests that are relevant to a given
|
|
object, from its docstring and the docstrings of its contained
|
|
objects. Doctests can currently be extracted from the following
|
|
object types: modules, functions, classes, methods, staticmethods,
|
|
classmethods, and properties.
|
|
"""
|
|
|
|
def __init__(self, verbose=False, parser=DocTestParser(),
|
|
recurse=True, exclude_empty=True):
|
|
"""
|
|
Create a new doctest finder.
|
|
|
|
The optional argument `parser` specifies a class or
|
|
function that should be used to create new DocTest objects (or
|
|
objects that implement the same interface as DocTest). The
|
|
signature for this factory function should match the signature
|
|
of the DocTest constructor.
|
|
|
|
If the optional argument `recurse` is false, then `find` will
|
|
only examine the given object, and not any contained objects.
|
|
|
|
If the optional argument `exclude_empty` is false, then `find`
|
|
will include tests for objects with empty docstrings.
|
|
"""
|
|
self._parser = parser
|
|
self._verbose = verbose
|
|
self._recurse = recurse
|
|
self._exclude_empty = exclude_empty
|
|
|
|
def find(self, obj, name=None, module=None, globs=None, extraglobs=None):
|
|
"""
|
|
Return a list of the DocTests that are defined by the given
|
|
object's docstring, or by any of its contained objects'
|
|
docstrings.
|
|
|
|
The optional parameter `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:
|
|
|
|
- As a default namespace, if `globs` is not specified.
|
|
- To prevent the DocTestFinder from extracting DocTests
|
|
from objects that are imported from other modules.
|
|
- To find the name of the file containing the object.
|
|
- To help find the line number of the object within its
|
|
file.
|
|
|
|
Contained objects whose module does not match `module` are ignored.
|
|
|
|
If `module` is False, no attempt to find the module will be made.
|
|
This is obscure, of use mostly in tests: if `module` is False, or
|
|
is 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 DocTest is formed by combining `globs`
|
|
and `extraglobs` (bindings in `extraglobs` override bindings
|
|
in `globs`). A new copy of the globals dictionary is created
|
|
for each DocTest. If `globs` is not specified, then it
|
|
defaults to the module's `__dict__`, if specified, or {}
|
|
otherwise. If `extraglobs` is not specified, then it defaults
|
|
to {}.
|
|
|
|
"""
|
|
# If name was not specified, then extract it from the object.
|
|
if name is None:
|
|
name = getattr(obj, '__name__', None)
|
|
if name is None:
|
|
raise ValueError("DocTestFinder.find: name must be given "
|
|
"when obj.__name__ doesn't exist: %r" %
|
|
(type(obj),))
|
|
|
|
# Find the module that contains the given object (if obj is
|
|
# a module, then module=obj.). Note: this may fail, in which
|
|
# case module will be None.
|
|
if module is False:
|
|
module = None
|
|
elif module is None:
|
|
module = inspect.getmodule(obj)
|
|
|
|
# Read the module's source code. This is used by
|
|
# DocTestFinder._find_lineno to find the line number for a
|
|
# given object's docstring.
|
|
try:
|
|
file = inspect.getsourcefile(obj) or inspect.getfile(obj)
|
|
source_lines = linecache.getlines(file)
|
|
if not source_lines:
|
|
source_lines = None
|
|
except TypeError:
|
|
source_lines = None
|
|
|
|
# Initialize globals, and merge in extraglobs.
|
|
if globs is None:
|
|
if module is None:
|
|
globs = {}
|
|
else:
|
|
globs = module.__dict__.copy()
|
|
else:
|
|
globs = globs.copy()
|
|
if extraglobs is not None:
|
|
globs.update(extraglobs)
|
|
|
|
# Recursively expore `obj`, extracting DocTests.
|
|
tests = []
|
|
self._find(tests, obj, name, module, source_lines, globs, {})
|
|
# Sort the tests by alpha order of names, for consistency in
|
|
# verbose-mode output. This was a feature of doctest in Pythons
|
|
# <= 2.3 that got lost by accident in 2.4. It was repaired in
|
|
# 2.4.4 and 2.5.
|
|
tests.sort()
|
|
return tests
|
|
|
|
def _from_module(self, module, object):
|
|
"""
|
|
Return true if the given object is defined in the given
|
|
module.
|
|
"""
|
|
if module is None:
|
|
return True
|
|
elif inspect.isfunction(object):
|
|
return module.__dict__ is object.__globals__
|
|
elif inspect.isclass(object):
|
|
return module.__name__ == object.__module__
|
|
elif inspect.getmodule(object) is not None:
|
|
return module is inspect.getmodule(object)
|
|
elif hasattr(object, '__module__'):
|
|
return module.__name__ == object.__module__
|
|
elif isinstance(object, property):
|
|
return True # [XX] no way not be sure.
|
|
else:
|
|
raise ValueError("object must be a class or function")
|
|
|
|
def _find(self, tests, obj, name, module, source_lines, globs, seen):
|
|
"""
|
|
Find tests for the given object and any contained objects, and
|
|
add them to `tests`.
|
|
"""
|
|
if self._verbose:
|
|
print('Finding tests in %s' % name)
|
|
|
|
# If we've already processed this object, then ignore it.
|
|
if id(obj) in seen:
|
|
return
|
|
seen[id(obj)] = 1
|
|
|
|
# Find a test for this object, and add it to the list of tests.
|
|
test = self._get_test(obj, name, module, globs, source_lines)
|
|
if test is not None:
|
|
tests.append(test)
|
|
|
|
# Look for tests in a module's contained objects.
|
|
if inspect.ismodule(obj) and self._recurse:
|
|
for valname, val in obj.__dict__.items():
|
|
valname = '%s.%s' % (name, valname)
|
|
# Recurse to functions & classes.
|
|
if ((inspect.isfunction(val) or inspect.isclass(val)) and
|
|
self._from_module(module, val)):
|
|
self._find(tests, val, valname, module, source_lines,
|
|
globs, seen)
|
|
|
|
# Look for tests in a module's __test__ dictionary.
|
|
if inspect.ismodule(obj) and self._recurse:
|
|
for valname, val in getattr(obj, '__test__', {}).items():
|
|
if not isinstance(valname, basestring):
|
|
raise ValueError("DocTestFinder.find: __test__ keys "
|
|
"must be strings: %r" %
|
|
(type(valname),))
|
|
if not (inspect.isfunction(val) or inspect.isclass(val) or
|
|
inspect.ismethod(val) or inspect.ismodule(val) or
|
|
isinstance(val, basestring)):
|
|
raise ValueError("DocTestFinder.find: __test__ values "
|
|
"must be strings, functions, methods, "
|
|
"classes, or modules: %r" %
|
|
(type(val),))
|
|
valname = '%s.__test__.%s' % (name, valname)
|
|
self._find(tests, val, valname, module, source_lines,
|
|
globs, seen)
|
|
|
|
# Look for tests in a class's contained objects.
|
|
if inspect.isclass(obj) and self._recurse:
|
|
for valname, val in obj.__dict__.items():
|
|
# Special handling for staticmethod/classmethod.
|
|
if isinstance(val, staticmethod):
|
|
val = getattr(obj, valname)
|
|
if isinstance(val, classmethod):
|
|
val = getattr(obj, valname).im_func
|
|
|
|
# Recurse to methods, properties, and nested classes.
|
|
if ((inspect.isfunction(val) or inspect.isclass(val) or
|
|
isinstance(val, property)) and
|
|
self._from_module(module, val)):
|
|
valname = '%s.%s' % (name, valname)
|
|
self._find(tests, val, valname, module, source_lines,
|
|
globs, seen)
|
|
|
|
def _get_test(self, obj, name, module, globs, source_lines):
|
|
"""
|
|
Return a DocTest for the given object, if it defines a docstring;
|
|
otherwise, return None.
|
|
"""
|
|
# Extract the object's docstring. If it doesn't have one,
|
|
# then return None (no test for this object).
|
|
if isinstance(obj, basestring):
|
|
docstring = obj
|
|
else:
|
|
try:
|
|
if obj.__doc__ is None:
|
|
docstring = ''
|
|
else:
|
|
docstring = obj.__doc__
|
|
if not isinstance(docstring, basestring):
|
|
docstring = str(docstring)
|
|
except (TypeError, AttributeError):
|
|
docstring = ''
|
|
|
|
# Find the docstring's location in the file.
|
|
lineno = self._find_lineno(obj, source_lines)
|
|
|
|
# Don't bother if the docstring is empty.
|
|
if self._exclude_empty and not docstring:
|
|
return None
|
|
|
|
# Return a DocTest for this object.
|
|
if module is None:
|
|
filename = None
|
|
else:
|
|
filename = getattr(module, '__file__', module.__name__)
|
|
if filename[-4:] in (".pyc", ".pyo"):
|
|
filename = filename[:-1]
|
|
return self._parser.get_doctest(docstring, globs, name,
|
|
filename, lineno)
|
|
|
|
def _find_lineno(self, obj, source_lines):
|
|
"""
|
|
Return a line number of the given object's docstring. Note:
|
|
this method assumes that the object has a docstring.
|
|
"""
|
|
lineno = None
|
|
|
|
# Find the line number for modules.
|
|
if inspect.ismodule(obj):
|
|
lineno = 0
|
|
|
|
# Find the line number for classes.
|
|
# Note: this could be fooled if a class is defined multiple
|
|
# times in a single file.
|
|
if inspect.isclass(obj):
|
|
if source_lines is None:
|
|
return None
|
|
pat = re.compile(r'^\s*class\s*%s\b' %
|
|
getattr(obj, '__name__', '-'))
|
|
for i, line in enumerate(source_lines):
|
|
if pat.match(line):
|
|
lineno = i
|
|
break
|
|
|
|
# Find the line number for functions & methods.
|
|
if inspect.ismethod(obj): obj = obj.im_func
|
|
if inspect.isfunction(obj): obj = obj.__code__
|
|
if inspect.istraceback(obj): obj = obj.tb_frame
|
|
if inspect.isframe(obj): obj = obj.f_code
|
|
if inspect.iscode(obj):
|
|
lineno = getattr(obj, 'co_firstlineno', None)-1
|
|
|
|
# Find the line number where the docstring starts. Assume
|
|
# that it's the first line that begins with a quote mark.
|
|
# Note: this could be fooled by a multiline function
|
|
# signature, where a continuation line begins with a quote
|
|
# mark.
|
|
if lineno is not None:
|
|
if source_lines is None:
|
|
return lineno+1
|
|
pat = re.compile('(^|.*:)\s*\w*("|\')')
|
|
for lineno in range(lineno, len(source_lines)):
|
|
if pat.match(source_lines[lineno]):
|
|
return lineno
|
|
|
|
# We couldn't find the line number.
|
|
return None
|
|
|
|
######################################################################
|
|
## 5. DocTest Runner
|
|
######################################################################
|
|
|
|
class DocTestRunner:
|
|
"""
|
|
A class used to run DocTest test cases, and accumulate statistics.
|
|
The `run` method is used to process a single DocTest case. It
|
|
returns a tuple `(f, t)`, where `t` is the number of test cases
|
|
tried, and `f` is the number of test cases that failed.
|
|
|
|
>>> tests = DocTestFinder().find(_TestClass)
|
|
>>> runner = DocTestRunner(verbose=False)
|
|
>>> tests.sort(key = lambda test: test.name)
|
|
>>> for test in tests:
|
|
... print(test.name, '->', runner.run(test))
|
|
_TestClass -> (0, 2)
|
|
_TestClass.__init__ -> (0, 2)
|
|
_TestClass.get -> (0, 2)
|
|
_TestClass.square -> (0, 1)
|
|
|
|
The `summarize` method prints a summary of all the test cases that
|
|
have been run by the runner, and returns an aggregated `(f, t)`
|
|
tuple:
|
|
|
|
>>> runner.summarize(verbose=1)
|
|
4 items passed all tests:
|
|
2 tests in _TestClass
|
|
2 tests in _TestClass.__init__
|
|
2 tests in _TestClass.get
|
|
1 tests in _TestClass.square
|
|
7 tests in 4 items.
|
|
7 passed and 0 failed.
|
|
Test passed.
|
|
(0, 7)
|
|
|
|
The aggregated number of tried examples and failed examples is
|
|
also available via the `tries` and `failures` attributes:
|
|
|
|
>>> runner.tries
|
|
7
|
|
>>> runner.failures
|
|
0
|
|
|
|
The comparison between expected outputs and actual outputs is done
|
|
by an `OutputChecker`. This comparison may be customized with a
|
|
number of option flags; see the documentation for `testmod` for
|
|
more information. If the option flags are insufficient, then the
|
|
comparison may also be customized by passing a subclass of
|
|
`OutputChecker` to the constructor.
|
|
|
|
The test runner's display output can be controlled in two ways.
|
|
First, an output function (`out) can be passed to
|
|
`TestRunner.run`; this function will be called with strings that
|
|
should be displayed. It defaults to `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 `report_start`, `report_success`,
|
|
`report_unexpected_exception`, and `report_failure`.
|
|
"""
|
|
# This divider string is used to separate failure messages, and to
|
|
# separate sections of the summary.
|
|
DIVIDER = "*" * 70
|
|
|
|
def __init__(self, checker=None, verbose=None, optionflags=0):
|
|
"""
|
|
Create a new test runner.
|
|
|
|
Optional keyword arg `checker` is the `OutputChecker` that
|
|
should be used to compare the expected outputs and actual
|
|
outputs of doctest examples.
|
|
|
|
Optional keyword arg 'verbose' prints lots of stuff if true,
|
|
only failures if false; by default, it's true iff '-v' is in
|
|
sys.argv.
|
|
|
|
Optional argument `optionflags` can be used to control how the
|
|
test runner compares expected output to actual output, and how
|
|
it displays failures. See the documentation for `testmod` for
|
|
more information.
|
|
"""
|
|
self._checker = checker or OutputChecker()
|
|
if verbose is None:
|
|
verbose = '-v' in sys.argv
|
|
self._verbose = verbose
|
|
self.optionflags = optionflags
|
|
self.original_optionflags = optionflags
|
|
|
|
# Keep track of the examples we've run.
|
|
self.tries = 0
|
|
self.failures = 0
|
|
self._name2ft = {}
|
|
|
|
# Create a fake output target for capturing doctest output.
|
|
self._fakeout = _SpoofOut()
|
|
|
|
#/////////////////////////////////////////////////////////////////
|
|
# Reporting methods
|
|
#/////////////////////////////////////////////////////////////////
|
|
|
|
def report_start(self, out, test, example):
|
|
"""
|
|
Report that the test runner is about to process the given
|
|
example. (Only displays a message if verbose=True)
|
|
"""
|
|
if self._verbose:
|
|
if example.want:
|
|
out('Trying:\n' + _indent(example.source) +
|
|
'Expecting:\n' + _indent(example.want))
|
|
else:
|
|
out('Trying:\n' + _indent(example.source) +
|
|
'Expecting nothing\n')
|
|
|
|
def report_success(self, out, test, example, got):
|
|
"""
|
|
Report that the given example ran successfully. (Only
|
|
displays a message if verbose=True)
|
|
"""
|
|
if self._verbose:
|
|
out("ok\n")
|
|
|
|
def report_failure(self, out, test, example, got):
|
|
"""
|
|
Report that the given example failed.
|
|
"""
|
|
out(self._failure_header(test, example) +
|
|
self._checker.output_difference(example, got, self.optionflags))
|
|
|
|
def report_unexpected_exception(self, out, test, example, exc_info):
|
|
"""
|
|
Report that the given example raised an unexpected exception.
|
|
"""
|
|
out(self._failure_header(test, example) +
|
|
'Exception raised:\n' + _indent(_exception_traceback(exc_info)))
|
|
|
|
def _failure_header(self, test, example):
|
|
out = [self.DIVIDER]
|
|
if test.filename:
|
|
if test.lineno is not None and example.lineno is not None:
|
|
lineno = test.lineno + example.lineno + 1
|
|
else:
|
|
lineno = '?'
|
|
out.append('File "%s", line %s, in %s' %
|
|
(test.filename, lineno, test.name))
|
|
else:
|
|
out.append('Line %s, in %s' % (example.lineno+1, test.name))
|
|
out.append('Failed example:')
|
|
source = example.source
|
|
out.append(_indent(source))
|
|
return '\n'.join(out)
|
|
|
|
#/////////////////////////////////////////////////////////////////
|
|
# DocTest Running
|
|
#/////////////////////////////////////////////////////////////////
|
|
|
|
def __run(self, test, compileflags, out):
|
|
"""
|
|
Run the examples in `test`. Write the outcome of each example
|
|
with one of the `DocTestRunner.report_*` methods, using the
|
|
writer function `out`. `compileflags` is the set of compiler
|
|
flags that should be used to execute examples. Return a tuple
|
|
`(f, t)`, where `t` is the number of examples tried, and `f`
|
|
is the number of examples that failed. The examples are run
|
|
in the namespace `test.globs`.
|
|
"""
|
|
# Keep track of the number of failures and tries.
|
|
failures = tries = 0
|
|
|
|
# Save the option flags (since option directives can be used
|
|
# to modify them).
|
|
original_optionflags = self.optionflags
|
|
|
|
SUCCESS, FAILURE, BOOM = range(3) # `outcome` state
|
|
|
|
check = self._checker.check_output
|
|
|
|
# Process each example.
|
|
for examplenum, example in enumerate(test.examples):
|
|
|
|
# If REPORT_ONLY_FIRST_FAILURE is set, then supress
|
|
# reporting after the first failure.
|
|
quiet = (self.optionflags & REPORT_ONLY_FIRST_FAILURE and
|
|
failures > 0)
|
|
|
|
# Merge in the example's options.
|
|
self.optionflags = original_optionflags
|
|
if example.options:
|
|
for (optionflag, val) in example.options.items():
|
|
if val:
|
|
self.optionflags |= optionflag
|
|
else:
|
|
self.optionflags &= ~optionflag
|
|
|
|
# If 'SKIP' is set, then skip this example.
|
|
if self.optionflags & SKIP:
|
|
continue
|
|
|
|
# Record that we started this example.
|
|
tries += 1
|
|
if not quiet:
|
|
self.report_start(out, test, example)
|
|
|
|
# Use a special filename for compile(), so we can retrieve
|
|
# the source code during interactive debugging (see
|
|
# __patched_linecache_getlines).
|
|
filename = '<doctest %s[%d]>' % (test.name, examplenum)
|
|
|
|
# Run the example in the given context (globs), and record
|
|
# any exception that gets raised. (But don't intercept
|
|
# keyboard interrupts.)
|
|
try:
|
|
# Don't blink! This is where the user's code gets run.
|
|
exec(compile(example.source, filename, "single",
|
|
compileflags, 1), test.globs)
|
|
self.debugger.set_continue() # ==== Example Finished ====
|
|
exception = None
|
|
except KeyboardInterrupt:
|
|
raise
|
|
except:
|
|
exception = sys.exc_info()
|
|
self.debugger.set_continue() # ==== Example Finished ====
|
|
|
|
got = self._fakeout.getvalue() # the actual output
|
|
self._fakeout.truncate(0)
|
|
outcome = FAILURE # guilty until proved innocent or insane
|
|
|
|
# If the example executed without raising any exceptions,
|
|
# verify its output.
|
|
if exception is None:
|
|
if check(example.want, got, self.optionflags):
|
|
outcome = SUCCESS
|
|
|
|
# The example raised an exception: check if it was expected.
|
|
else:
|
|
exc_info = sys.exc_info()
|
|
exc_msg = traceback.format_exception_only(*exc_info[:2])[-1]
|
|
if not quiet:
|
|
got += _exception_traceback(exc_info)
|
|
|
|
# If `example.exc_msg` is None, then we weren't expecting
|
|
# an exception.
|
|
if example.exc_msg is None:
|
|
outcome = BOOM
|
|
|
|
# We expected an exception: see whether it matches.
|
|
elif check(example.exc_msg, exc_msg, self.optionflags):
|
|
outcome = SUCCESS
|
|
|
|
# Another chance if they didn't care about the detail.
|
|
elif self.optionflags & IGNORE_EXCEPTION_DETAIL:
|
|
m1 = re.match(r'[^:]*:', example.exc_msg)
|
|
m2 = re.match(r'[^:]*:', exc_msg)
|
|
if m1 and m2 and check(m1.group(0), m2.group(0),
|
|
self.optionflags):
|
|
outcome = SUCCESS
|
|
|
|
# Report the outcome.
|
|
if outcome is SUCCESS:
|
|
if not quiet:
|
|
self.report_success(out, test, example, got)
|
|
elif outcome is FAILURE:
|
|
if not quiet:
|
|
self.report_failure(out, test, example, got)
|
|
failures += 1
|
|
elif outcome is BOOM:
|
|
if not quiet:
|
|
self.report_unexpected_exception(out, test, example,
|
|
exc_info)
|
|
failures += 1
|
|
else:
|
|
assert False, ("unknown outcome", outcome)
|
|
|
|
# Restore the option flags (in case they were modified)
|
|
self.optionflags = original_optionflags
|
|
|
|
# Record and return the number of failures and tries.
|
|
self.__record_outcome(test, failures, tries)
|
|
return failures, tries
|
|
|
|
def __record_outcome(self, test, f, t):
|
|
"""
|
|
Record the fact that the given DocTest (`test`) generated `f`
|
|
failures out of `t` tried examples.
|
|
"""
|
|
f2, t2 = self._name2ft.get(test.name, (0,0))
|
|
self._name2ft[test.name] = (f+f2, t+t2)
|
|
self.failures += f
|
|
self.tries += t
|
|
|
|
__LINECACHE_FILENAME_RE = re.compile(r'<doctest '
|
|
r'(?P<name>[\w\.]+)'
|
|
r'\[(?P<examplenum>\d+)\]>$')
|
|
def __patched_linecache_getlines(self, filename, module_globals=None):
|
|
m = self.__LINECACHE_FILENAME_RE.match(filename)
|
|
if m and m.group('name') == self.test.name:
|
|
example = self.test.examples[int(m.group('examplenum'))]
|
|
return example.source.splitlines(True)
|
|
else:
|
|
return self.save_linecache_getlines(filename, module_globals)
|
|
|
|
def run(self, test, compileflags=None, out=None, clear_globs=True):
|
|
"""
|
|
Run the examples in `test`, and display the results using the
|
|
writer function `out`.
|
|
|
|
The examples are run in the namespace `test.globs`. If
|
|
`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 `clear_globs=False`.
|
|
|
|
`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 `globs`.
|
|
|
|
The output of each example is checked using
|
|
`DocTestRunner.check_output`, and the results are formatted by
|
|
the `DocTestRunner.report_*` methods.
|
|
"""
|
|
self.test = test
|
|
|
|
if compileflags is None:
|
|
compileflags = _extract_future_flags(test.globs)
|
|
|
|
save_stdout = sys.stdout
|
|
if out is None:
|
|
out = save_stdout.write
|
|
sys.stdout = self._fakeout
|
|
|
|
# Patch pdb.set_trace to restore sys.stdout during interactive
|
|
# debugging (so it's not still redirected to self._fakeout).
|
|
# Note that the interactive output will go to *our*
|
|
# save_stdout, even if that's not the real sys.stdout; this
|
|
# allows us to write test cases for the set_trace behavior.
|
|
save_set_trace = pdb.set_trace
|
|
self.debugger = _OutputRedirectingPdb(save_stdout)
|
|
self.debugger.reset()
|
|
pdb.set_trace = self.debugger.set_trace
|
|
|
|
# Patch linecache.getlines, so we can see the example's source
|
|
# when we're inside the debugger.
|
|
self.save_linecache_getlines = linecache.getlines
|
|
linecache.getlines = self.__patched_linecache_getlines
|
|
|
|
try:
|
|
return self.__run(test, compileflags, out)
|
|
finally:
|
|
sys.stdout = save_stdout
|
|
pdb.set_trace = save_set_trace
|
|
linecache.getlines = self.save_linecache_getlines
|
|
if clear_globs:
|
|
test.globs.clear()
|
|
|
|
#/////////////////////////////////////////////////////////////////
|
|
# Summarization
|
|
#/////////////////////////////////////////////////////////////////
|
|
def summarize(self, verbose=None):
|
|
"""
|
|
Print a summary of all the test cases that have been run by
|
|
this DocTestRunner, and return a tuple `(f, t)`, where `f` is
|
|
the total number of failed examples, and `t` is the total
|
|
number of tried examples.
|
|
|
|
The optional `verbose` argument controls how detailed the
|
|
summary is. If the verbosity is not specified, then the
|
|
DocTestRunner's verbosity is used.
|
|
"""
|
|
if verbose is None:
|
|
verbose = self._verbose
|
|
notests = []
|
|
passed = []
|
|
failed = []
|
|
totalt = totalf = 0
|
|
for x in self._name2ft.items():
|
|
name, (f, t) = x
|
|
assert f <= t
|
|
totalt += t
|
|
totalf += f
|
|
if t == 0:
|
|
notests.append(name)
|
|
elif f == 0:
|
|
passed.append( (name, t) )
|
|
else:
|
|
failed.append(x)
|
|
if verbose:
|
|
if notests:
|
|
print(len(notests), "items had no tests:")
|
|
notests.sort()
|
|
for thing in notests:
|
|
print(" ", thing)
|
|
if passed:
|
|
print(len(passed), "items passed all tests:")
|
|
passed.sort()
|
|
for thing, count in passed:
|
|
print(" %3d tests in %s" % (count, thing))
|
|
if failed:
|
|
print(self.DIVIDER)
|
|
print(len(failed), "items had failures:")
|
|
failed.sort()
|
|
for thing, (f, t) in failed:
|
|
print(" %3d of %3d in %s" % (f, t, thing))
|
|
if verbose:
|
|
print(totalt, "tests in", len(self._name2ft), "items.")
|
|
print(totalt - totalf, "passed and", totalf, "failed.")
|
|
if totalf:
|
|
print("***Test Failed***", totalf, "failures.")
|
|
elif verbose:
|
|
print("Test passed.")
|
|
return totalf, totalt
|
|
|
|
#/////////////////////////////////////////////////////////////////
|
|
# Backward compatibility cruft to maintain doctest.master.
|
|
#/////////////////////////////////////////////////////////////////
|
|
def merge(self, other):
|
|
d = self._name2ft
|
|
for name, (f, t) in other._name2ft.items():
|
|
if name in d:
|
|
print("*** DocTestRunner.merge: '" + name + "' in both" \
|
|
" testers; summing outcomes.")
|
|
f2, t2 = d[name]
|
|
f = f + f2
|
|
t = t + t2
|
|
d[name] = f, t
|
|
|
|
class OutputChecker:
|
|
"""
|
|
A class used to check the whether the actual output from a doctest
|
|
example matches the expected output. `OutputChecker` defines two
|
|
methods: `check_output`, which compares a given pair of outputs,
|
|
and returns true if they match; and `output_difference`, which
|
|
returns a string describing the differences between two outputs.
|
|
"""
|
|
def check_output(self, want, got, optionflags):
|
|
"""
|
|
Return True iff the actual output from an example (`got`)
|
|
matches the expected output (`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 the
|
|
documentation for `TestRunner` for more information about
|
|
option flags.
|
|
"""
|
|
# Handle the common case first, for efficiency:
|
|
# if they're string-identical, always return true.
|
|
if got == want:
|
|
return True
|
|
|
|
# The values True and False replaced 1 and 0 as the return
|
|
# value for boolean comparisons in Python 2.3.
|
|
if not (optionflags & DONT_ACCEPT_TRUE_FOR_1):
|
|
if (got,want) == ("True\n", "1\n"):
|
|
return True
|
|
if (got,want) == ("False\n", "0\n"):
|
|
return True
|
|
|
|
# <BLANKLINE> can be used as a special sequence to signify a
|
|
# blank line, unless the DONT_ACCEPT_BLANKLINE flag is used.
|
|
if not (optionflags & DONT_ACCEPT_BLANKLINE):
|
|
# Replace <BLANKLINE> in want with a blank line.
|
|
want = re.sub('(?m)^%s\s*?$' % re.escape(BLANKLINE_MARKER),
|
|
'', want)
|
|
# If a line in got contains only spaces, then remove the
|
|
# spaces.
|
|
got = re.sub('(?m)^\s*?$', '', got)
|
|
if got == want:
|
|
return True
|
|
|
|
# This flag causes doctest to ignore any differences in the
|
|
# contents of whitespace strings. Note that this can be used
|
|
# in conjunction with the ELLIPSIS flag.
|
|
if optionflags & NORMALIZE_WHITESPACE:
|
|
got = ' '.join(got.split())
|
|
want = ' '.join(want.split())
|
|
if got == want:
|
|
return True
|
|
|
|
# The ELLIPSIS flag says to let the sequence "..." in `want`
|
|
# match any substring in `got`.
|
|
if optionflags & ELLIPSIS:
|
|
if _ellipsis_match(want, got):
|
|
return True
|
|
|
|
# We didn't find any match; return false.
|
|
return False
|
|
|
|
# Should we do a fancy diff?
|
|
def _do_a_fancy_diff(self, want, got, optionflags):
|
|
# Not unless they asked for a fancy diff.
|
|
if not optionflags & (REPORT_UDIFF |
|
|
REPORT_CDIFF |
|
|
REPORT_NDIFF):
|
|
return False
|
|
|
|
# If expected output uses ellipsis, a meaningful fancy diff is
|
|
# too hard ... or maybe not. In two real-life failures Tim saw,
|
|
# a diff was a major help anyway, so this is commented out.
|
|
# [todo] _ellipsis_match() knows which pieces do and don't match,
|
|
# and could be the basis for a kick-ass diff in this case.
|
|
##if optionflags & ELLIPSIS and ELLIPSIS_MARKER in want:
|
|
## return False
|
|
|
|
# ndiff does intraline difference marking, so can be useful even
|
|
# for 1-line differences.
|
|
if optionflags & REPORT_NDIFF:
|
|
return True
|
|
|
|
# The other diff types need at least a few lines to be helpful.
|
|
return want.count('\n') > 2 and got.count('\n') > 2
|
|
|
|
def output_difference(self, example, got, optionflags):
|
|
"""
|
|
Return a string describing the differences between the
|
|
expected output for a given example (`example`) and the actual
|
|
output (`got`). `optionflags` is the set of option flags used
|
|
to compare `want` and `got`.
|
|
"""
|
|
want = example.want
|
|
# If <BLANKLINE>s are being used, then replace blank lines
|
|
# with <BLANKLINE> in the actual output string.
|
|
if not (optionflags & DONT_ACCEPT_BLANKLINE):
|
|
got = re.sub('(?m)^[ ]*(?=\n)', BLANKLINE_MARKER, got)
|
|
|
|
# Check if we should use diff.
|
|
if self._do_a_fancy_diff(want, got, optionflags):
|
|
# Split want & got into lines.
|
|
want_lines = want.splitlines(True) # True == keep line ends
|
|
got_lines = got.splitlines(True)
|
|
# Use difflib to find their differences.
|
|
if optionflags & REPORT_UDIFF:
|
|
diff = difflib.unified_diff(want_lines, got_lines, n=2)
|
|
diff = list(diff)[2:] # strip the diff header
|
|
kind = 'unified diff with -expected +actual'
|
|
elif optionflags & REPORT_CDIFF:
|
|
diff = difflib.context_diff(want_lines, got_lines, n=2)
|
|
diff = list(diff)[2:] # strip the diff header
|
|
kind = 'context diff with expected followed by actual'
|
|
elif optionflags & REPORT_NDIFF:
|
|
engine = difflib.Differ(charjunk=difflib.IS_CHARACTER_JUNK)
|
|
diff = list(engine.compare(want_lines, got_lines))
|
|
kind = 'ndiff with -expected +actual'
|
|
else:
|
|
assert 0, 'Bad diff option'
|
|
# Remove trailing whitespace on diff output.
|
|
diff = [line.rstrip() + '\n' for line in diff]
|
|
return 'Differences (%s):\n' % kind + _indent(''.join(diff))
|
|
|
|
# If we're not using diff, then simply list the expected
|
|
# output followed by the actual output.
|
|
if want and got:
|
|
return 'Expected:\n%sGot:\n%s' % (_indent(want), _indent(got))
|
|
elif want:
|
|
return 'Expected:\n%sGot nothing\n' % _indent(want)
|
|
elif got:
|
|
return 'Expected nothing\nGot:\n%s' % _indent(got)
|
|
else:
|
|
return 'Expected nothing\nGot nothing\n'
|
|
|
|
class DocTestFailure(Exception):
|
|
"""A DocTest example has failed in debugging mode.
|
|
|
|
The exception instance has variables:
|
|
|
|
- test: the DocTest object being run
|
|
|
|
- example: the Example object that failed
|
|
|
|
- got: the actual output
|
|
"""
|
|
def __init__(self, test, example, got):
|
|
self.test = test
|
|
self.example = example
|
|
self.got = got
|
|
|
|
def __str__(self):
|
|
return str(self.test)
|
|
|
|
class UnexpectedException(Exception):
|
|
"""A DocTest example has encountered an unexpected exception
|
|
|
|
The exception instance has variables:
|
|
|
|
- test: the DocTest object being run
|
|
|
|
- example: the Example object that failed
|
|
|
|
- exc_info: the exception info
|
|
"""
|
|
def __init__(self, test, example, exc_info):
|
|
self.test = test
|
|
self.example = example
|
|
self.exc_info = exc_info
|
|
|
|
def __str__(self):
|
|
return str(self.test)
|
|
|
|
class DebugRunner(DocTestRunner):
|
|
r"""Run doc tests but raise an exception as soon as there is a failure.
|
|
|
|
If an unexpected exception occurs, an UnexpectedException is raised.
|
|
It contains the test, the example, and the original exception:
|
|
|
|
>>> runner = DebugRunner(verbose=False)
|
|
>>> test = DocTestParser().get_doctest('>>> raise KeyError\n42',
|
|
... {}, 'foo', 'foo.py', 0)
|
|
>>> try:
|
|
... runner.run(test)
|
|
... except UnexpectedException as f:
|
|
... failure = f
|
|
|
|
>>> failure.test is test
|
|
True
|
|
|
|
>>> failure.example.want
|
|
'42\n'
|
|
|
|
>>> exc_info = failure.exc_info
|
|
>>> raise exc_info[0], exc_info[1], exc_info[2]
|
|
Traceback (most recent call last):
|
|
...
|
|
KeyError
|
|
|
|
We wrap the original exception to give the calling application
|
|
access to the test and example information.
|
|
|
|
If the output doesn't match, then a DocTestFailure is raised:
|
|
|
|
>>> test = DocTestParser().get_doctest('''
|
|
... >>> x = 1
|
|
... >>> x
|
|
... 2
|
|
... ''', {}, 'foo', 'foo.py', 0)
|
|
|
|
>>> try:
|
|
... runner.run(test)
|
|
... except DocTestFailure as f:
|
|
... failure = f
|
|
|
|
DocTestFailure objects provide access to the test:
|
|
|
|
>>> failure.test is test
|
|
True
|
|
|
|
As well as to the example:
|
|
|
|
>>> failure.example.want
|
|
'2\n'
|
|
|
|
and the actual output:
|
|
|
|
>>> failure.got
|
|
'1\n'
|
|
|
|
If a failure or error occurs, the globals are left intact:
|
|
|
|
>>> del test.globs['__builtins__']
|
|
>>> test.globs
|
|
{'x': 1}
|
|
|
|
>>> test = DocTestParser().get_doctest('''
|
|
... >>> x = 2
|
|
... >>> raise KeyError
|
|
... ''', {}, 'foo', 'foo.py', 0)
|
|
|
|
>>> runner.run(test)
|
|
Traceback (most recent call last):
|
|
...
|
|
doctest.UnexpectedException: <DocTest foo from foo.py:0 (2 examples)>
|
|
|
|
>>> del test.globs['__builtins__']
|
|
>>> test.globs
|
|
{'x': 2}
|
|
|
|
But the globals are cleared if there is no error:
|
|
|
|
>>> test = DocTestParser().get_doctest('''
|
|
... >>> x = 2
|
|
... ''', {}, 'foo', 'foo.py', 0)
|
|
|
|
>>> runner.run(test)
|
|
(0, 1)
|
|
|
|
>>> test.globs
|
|
{}
|
|
|
|
"""
|
|
|
|
def run(self, test, compileflags=None, out=None, clear_globs=True):
|
|
r = DocTestRunner.run(self, test, compileflags, out, False)
|
|
if clear_globs:
|
|
test.globs.clear()
|
|
return r
|
|
|
|
def report_unexpected_exception(self, out, test, example, exc_info):
|
|
raise UnexpectedException(test, example, exc_info)
|
|
|
|
def report_failure(self, out, test, example, got):
|
|
raise DocTestFailure(test, example, got)
|
|
|
|
######################################################################
|
|
## 6. Test Functions
|
|
######################################################################
|
|
# These should be backwards compatible.
|
|
|
|
# For backward compatibility, a global instance of a DocTestRunner
|
|
# class, updated by testmod.
|
|
master = None
|
|
|
|
def testmod(m=None, name=None, globs=None, verbose=None,
|
|
report=True, optionflags=0, extraglobs=None,
|
|
raise_on_error=False, exclude_empty=False):
|
|
"""m=None, name=None, globs=None, verbose=None, report=True,
|
|
optionflags=0, extraglobs=None, raise_on_error=False,
|
|
exclude_empty=False
|
|
|
|
Test examples in docstrings in functions and classes reachable
|
|
from module m (or the current module if m is not supplied), starting
|
|
with m.__doc__.
|
|
|
|
Also test examples reachable from dict m.__test__ if it exists and is
|
|
not None. m.__test__ maps names to functions, classes and strings;
|
|
function and class docstrings are tested even if the name is private;
|
|
strings are tested directly, as if they were docstrings.
|
|
|
|
Return (#failures, #tests).
|
|
|
|
See doctest.__doc__ for an overview.
|
|
|
|
Optional keyword arg "name" gives the name of the module; by default
|
|
use m.__name__.
|
|
|
|
Optional keyword arg "globs" gives a dict to be used as the globals
|
|
when executing examples; by default, use m.__dict__. A copy of this
|
|
dict is actually used for each docstring, so that each docstring's
|
|
examples start with a clean slate.
|
|
|
|
Optional keyword arg "extraglobs" gives a dictionary that should be
|
|
merged into the globals that are used to execute examples. By
|
|
default, no extra globals are used. This is new in 2.4.
|
|
|
|
Optional keyword arg "verbose" prints lots of stuff if true, prints
|
|
only failures if false; by default, it's true iff "-v" is in sys.argv.
|
|
|
|
Optional keyword arg "report" prints a summary at the end when true,
|
|
else prints nothing at the end. In verbose mode, the summary is
|
|
detailed, else very brief (in fact, empty if all tests passed).
|
|
|
|
Optional keyword arg "optionflags" or's together module constants,
|
|
and defaults to 0. This is new in 2.3. Possible values (see the
|
|
docs for details):
|
|
|
|
DONT_ACCEPT_TRUE_FOR_1
|
|
DONT_ACCEPT_BLANKLINE
|
|
NORMALIZE_WHITESPACE
|
|
ELLIPSIS
|
|
SKIP
|
|
IGNORE_EXCEPTION_DETAIL
|
|
REPORT_UDIFF
|
|
REPORT_CDIFF
|
|
REPORT_NDIFF
|
|
REPORT_ONLY_FIRST_FAILURE
|
|
|
|
Optional keyword arg "raise_on_error" raises an exception on the
|
|
first unexpected exception or failure. This allows failures to be
|
|
post-mortem debugged.
|
|
|
|
Advanced tomfoolery: testmod runs methods of a local instance of
|
|
class doctest.Tester, then merges the results into (or creates)
|
|
global Tester instance doctest.master. Methods of doctest.master
|
|
can be called directly too, if you want to do something unusual.
|
|
Passing report=0 to testmod is especially useful then, to delay
|
|
displaying a summary. Invoke doctest.master.summarize(verbose)
|
|
when you're done fiddling.
|
|
"""
|
|
global master
|
|
|
|
# If no module was given, then use __main__.
|
|
if m is None:
|
|
# DWA - m will still be None if this wasn't invoked from the command
|
|
# line, in which case the following TypeError is about as good an error
|
|
# as we should expect
|
|
m = sys.modules.get('__main__')
|
|
|
|
# Check that we were actually given a module.
|
|
if not inspect.ismodule(m):
|
|
raise TypeError("testmod: module required; %r" % (m,))
|
|
|
|
# If no name was given, then use the module's name.
|
|
if name is None:
|
|
name = m.__name__
|
|
|
|
# Find, parse, and run all tests in the given module.
|
|
finder = DocTestFinder(exclude_empty=exclude_empty)
|
|
|
|
if raise_on_error:
|
|
runner = DebugRunner(verbose=verbose, optionflags=optionflags)
|
|
else:
|
|
runner = DocTestRunner(verbose=verbose, optionflags=optionflags)
|
|
|
|
for test in finder.find(m, name, globs=globs, extraglobs=extraglobs):
|
|
runner.run(test)
|
|
|
|
if report:
|
|
runner.summarize()
|
|
|
|
if master is None:
|
|
master = runner
|
|
else:
|
|
master.merge(runner)
|
|
|
|
return runner.failures, runner.tries
|
|
|
|
def testfile(filename, module_relative=True, name=None, package=None,
|
|
globs=None, verbose=None, report=True, optionflags=0,
|
|
extraglobs=None, raise_on_error=False, parser=DocTestParser(),
|
|
encoding=None):
|
|
"""
|
|
Test examples in the given file. Return (#failures, #tests).
|
|
|
|
Optional keyword arg "module_relative" specifies how filenames
|
|
should be interpreted:
|
|
|
|
- If "module_relative" is True (the default), then "filename"
|
|
specifies a module-relative path. By default, this path is
|
|
relative to the calling module's directory; but if the
|
|
"package" argument is specified, then it is relative to that
|
|
package. To ensure os-independence, "filename" should use
|
|
"/" characters to separate path segments, and should not
|
|
be an absolute path (i.e., it may not begin with "/").
|
|
|
|
- If "module_relative" is False, then "filename" specifies an
|
|
os-specific path. The path may be absolute or relative (to
|
|
the current working directory).
|
|
|
|
Optional keyword arg "name" gives the name of the test; by default
|
|
use the file's basename.
|
|
|
|
Optional keyword argument "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 "package" if "module_relative" is False.
|
|
|
|
Optional keyword arg "globs" gives a dict to be used as the globals
|
|
when executing examples; by default, use {}. A copy of this dict
|
|
is actually used for each docstring, so that each docstring's
|
|
examples start with a clean slate.
|
|
|
|
Optional keyword arg "extraglobs" gives a dictionary that should be
|
|
merged into the globals that are used to execute examples. By
|
|
default, no extra globals are used.
|
|
|
|
Optional keyword arg "verbose" prints lots of stuff if true, prints
|
|
only failures if false; by default, it's true iff "-v" is in sys.argv.
|
|
|
|
Optional keyword arg "report" prints a summary at the end when true,
|
|
else prints nothing at the end. In verbose mode, the summary is
|
|
detailed, else very brief (in fact, empty if all tests passed).
|
|
|
|
Optional keyword arg "optionflags" or's together module constants,
|
|
and defaults to 0. Possible values (see the docs for details):
|
|
|
|
DONT_ACCEPT_TRUE_FOR_1
|
|
DONT_ACCEPT_BLANKLINE
|
|
NORMALIZE_WHITESPACE
|
|
ELLIPSIS
|
|
SKIP
|
|
IGNORE_EXCEPTION_DETAIL
|
|
REPORT_UDIFF
|
|
REPORT_CDIFF
|
|
REPORT_NDIFF
|
|
REPORT_ONLY_FIRST_FAILURE
|
|
|
|
Optional keyword arg "raise_on_error" raises an exception on the
|
|
first unexpected exception or failure. This allows failures to be
|
|
post-mortem debugged.
|
|
|
|
Optional keyword arg "parser" specifies a DocTestParser (or
|
|
subclass) that should be used to extract tests from the files.
|
|
|
|
Optional keyword arg "encoding" specifies an encoding that should
|
|
be used to convert the file to unicode.
|
|
|
|
Advanced tomfoolery: testmod runs methods of a local instance of
|
|
class doctest.Tester, then merges the results into (or creates)
|
|
global Tester instance doctest.master. Methods of doctest.master
|
|
can be called directly too, if you want to do something unusual.
|
|
Passing report=0 to testmod is especially useful then, to delay
|
|
displaying a summary. Invoke doctest.master.summarize(verbose)
|
|
when you're done fiddling.
|
|
"""
|
|
global master
|
|
|
|
if package and not module_relative:
|
|
raise ValueError("Package may only be specified for module-"
|
|
"relative paths.")
|
|
|
|
# Relativize the path
|
|
text, filename = _load_testfile(filename, package, module_relative)
|
|
|
|
# If no name was given, then use the file's name.
|
|
if name is None:
|
|
name = os.path.basename(filename)
|
|
|
|
# Assemble the globals.
|
|
if globs is None:
|
|
globs = {}
|
|
else:
|
|
globs = globs.copy()
|
|
if extraglobs is not None:
|
|
globs.update(extraglobs)
|
|
|
|
if raise_on_error:
|
|
runner = DebugRunner(verbose=verbose, optionflags=optionflags)
|
|
else:
|
|
runner = DocTestRunner(verbose=verbose, optionflags=optionflags)
|
|
|
|
if encoding is not None:
|
|
text = text.decode(encoding)
|
|
|
|
# Read the file, convert it to a test, and run it.
|
|
test = parser.get_doctest(text, globs, name, filename, 0)
|
|
runner.run(test)
|
|
|
|
if report:
|
|
runner.summarize()
|
|
|
|
if master is None:
|
|
master = runner
|
|
else:
|
|
master.merge(runner)
|
|
|
|
return runner.failures, runner.tries
|
|
|
|
def run_docstring_examples(f, globs, verbose=False, name="NoName",
|
|
compileflags=None, optionflags=0):
|
|
"""
|
|
Test examples in the given object's docstring (`f`), using `globs`
|
|
as globals. Optional argument `name` is used in failure messages.
|
|
If the optional argument `verbose` is true, then generate output
|
|
even if there are no failures.
|
|
|
|
`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
|
|
`globs`.
|
|
|
|
Optional keyword arg `optionflags` specifies options for the
|
|
testing and output. See the documentation for `testmod` for more
|
|
information.
|
|
"""
|
|
# Find, parse, and run all tests in the given module.
|
|
finder = DocTestFinder(verbose=verbose, recurse=False)
|
|
runner = DocTestRunner(verbose=verbose, optionflags=optionflags)
|
|
for test in finder.find(f, name, globs=globs):
|
|
runner.run(test, compileflags=compileflags)
|
|
|
|
######################################################################
|
|
## 7. Tester
|
|
######################################################################
|
|
# This is provided only for backwards compatibility. It's not
|
|
# actually used in any way.
|
|
|
|
class Tester:
|
|
def __init__(self, mod=None, globs=None, verbose=None, optionflags=0):
|
|
|
|
warnings.warn("class Tester is deprecated; "
|
|
"use class doctest.DocTestRunner instead",
|
|
DeprecationWarning, stacklevel=2)
|
|
if mod is None and globs is None:
|
|
raise TypeError("Tester.__init__: must specify mod or globs")
|
|
if mod is not None and not inspect.ismodule(mod):
|
|
raise TypeError("Tester.__init__: mod must be a module; %r" %
|
|
(mod,))
|
|
if globs is None:
|
|
globs = mod.__dict__
|
|
self.globs = globs
|
|
|
|
self.verbose = verbose
|
|
self.optionflags = optionflags
|
|
self.testfinder = DocTestFinder()
|
|
self.testrunner = DocTestRunner(verbose=verbose,
|
|
optionflags=optionflags)
|
|
|
|
def runstring(self, s, name):
|
|
test = DocTestParser().get_doctest(s, self.globs, name, None, None)
|
|
if self.verbose:
|
|
print("Running string", name)
|
|
(f,t) = self.testrunner.run(test)
|
|
if self.verbose:
|
|
print(f, "of", t, "examples failed in string", name)
|
|
return (f,t)
|
|
|
|
def rundoc(self, object, name=None, module=None):
|
|
f = t = 0
|
|
tests = self.testfinder.find(object, name, module=module,
|
|
globs=self.globs)
|
|
for test in tests:
|
|
(f2, t2) = self.testrunner.run(test)
|
|
(f,t) = (f+f2, t+t2)
|
|
return (f,t)
|
|
|
|
def rundict(self, d, name, module=None):
|
|
import new
|
|
m = new.module(name)
|
|
m.__dict__.update(d)
|
|
if module is None:
|
|
module = False
|
|
return self.rundoc(m, name, module)
|
|
|
|
def run__test__(self, d, name):
|
|
import new
|
|
m = new.module(name)
|
|
m.__test__ = d
|
|
return self.rundoc(m, name)
|
|
|
|
def summarize(self, verbose=None):
|
|
return self.testrunner.summarize(verbose)
|
|
|
|
def merge(self, other):
|
|
self.testrunner.merge(other.testrunner)
|
|
|
|
######################################################################
|
|
## 8. Unittest Support
|
|
######################################################################
|
|
|
|
_unittest_reportflags = 0
|
|
|
|
def set_unittest_reportflags(flags):
|
|
"""Sets the unittest option flags.
|
|
|
|
The old flag is returned so that a runner could restore the old
|
|
value if it wished to:
|
|
|
|
>>> import doctest
|
|
>>> old = doctest._unittest_reportflags
|
|
>>> doctest.set_unittest_reportflags(REPORT_NDIFF |
|
|
... REPORT_ONLY_FIRST_FAILURE) == old
|
|
True
|
|
|
|
>>> doctest._unittest_reportflags == (REPORT_NDIFF |
|
|
... REPORT_ONLY_FIRST_FAILURE)
|
|
True
|
|
|
|
Only reporting flags can be set:
|
|
|
|
>>> doctest.set_unittest_reportflags(ELLIPSIS)
|
|
Traceback (most recent call last):
|
|
...
|
|
ValueError: ('Only reporting flags allowed', 8)
|
|
|
|
>>> doctest.set_unittest_reportflags(old) == (REPORT_NDIFF |
|
|
... REPORT_ONLY_FIRST_FAILURE)
|
|
True
|
|
"""
|
|
global _unittest_reportflags
|
|
|
|
if (flags & REPORTING_FLAGS) != flags:
|
|
raise ValueError("Only reporting flags allowed", flags)
|
|
old = _unittest_reportflags
|
|
_unittest_reportflags = flags
|
|
return old
|
|
|
|
|
|
class DocTestCase(unittest.TestCase):
|
|
|
|
def __init__(self, test, optionflags=0, setUp=None, tearDown=None,
|
|
checker=None):
|
|
|
|
unittest.TestCase.__init__(self)
|
|
self._dt_optionflags = optionflags
|
|
self._dt_checker = checker
|
|
self._dt_test = test
|
|
self._dt_setUp = setUp
|
|
self._dt_tearDown = tearDown
|
|
|
|
def setUp(self):
|
|
test = self._dt_test
|
|
|
|
if self._dt_setUp is not None:
|
|
self._dt_setUp(test)
|
|
|
|
def tearDown(self):
|
|
test = self._dt_test
|
|
|
|
if self._dt_tearDown is not None:
|
|
self._dt_tearDown(test)
|
|
|
|
test.globs.clear()
|
|
|
|
def runTest(self):
|
|
test = self._dt_test
|
|
old = sys.stdout
|
|
new = StringIO()
|
|
optionflags = self._dt_optionflags
|
|
|
|
if not (optionflags & REPORTING_FLAGS):
|
|
# The option flags don't include any reporting flags,
|
|
# so add the default reporting flags
|
|
optionflags |= _unittest_reportflags
|
|
|
|
runner = DocTestRunner(optionflags=optionflags,
|
|
checker=self._dt_checker, verbose=False)
|
|
|
|
try:
|
|
runner.DIVIDER = "-"*70
|
|
failures, tries = runner.run(
|
|
test, out=new.write, clear_globs=False)
|
|
finally:
|
|
sys.stdout = old
|
|
|
|
if failures:
|
|
raise self.failureException(self.format_failure(new.getvalue()))
|
|
|
|
def format_failure(self, err):
|
|
test = self._dt_test
|
|
if test.lineno is None:
|
|
lineno = 'unknown line number'
|
|
else:
|
|
lineno = '%s' % test.lineno
|
|
lname = '.'.join(test.name.split('.')[-1:])
|
|
return ('Failed doctest test for %s\n'
|
|
' File "%s", line %s, in %s\n\n%s'
|
|
% (test.name, test.filename, lineno, lname, err)
|
|
)
|
|
|
|
def debug(self):
|
|
r"""Run the test case without results and without catching exceptions
|
|
|
|
The unit test framework includes a debug method on test cases
|
|
and test suites to support post-mortem debugging. The test code
|
|
is run in such a way that errors are not caught. This way a
|
|
caller can catch the errors and initiate post-mortem debugging.
|
|
|
|
The DocTestCase provides a debug method that raises
|
|
UnexpectedException errors if there is an unexepcted
|
|
exception:
|
|
|
|
>>> test = DocTestParser().get_doctest('>>> raise KeyError\n42',
|
|
... {}, 'foo', 'foo.py', 0)
|
|
>>> case = DocTestCase(test)
|
|
>>> try:
|
|
... case.debug()
|
|
... except UnexpectedException as f:
|
|
... failure = f
|
|
|
|
The UnexpectedException contains the test, the example, and
|
|
the original exception:
|
|
|
|
>>> failure.test is test
|
|
True
|
|
|
|
>>> failure.example.want
|
|
'42\n'
|
|
|
|
>>> exc_info = failure.exc_info
|
|
>>> raise exc_info[0], exc_info[1], exc_info[2]
|
|
Traceback (most recent call last):
|
|
...
|
|
KeyError
|
|
|
|
If the output doesn't match, then a DocTestFailure is raised:
|
|
|
|
>>> test = DocTestParser().get_doctest('''
|
|
... >>> x = 1
|
|
... >>> x
|
|
... 2
|
|
... ''', {}, 'foo', 'foo.py', 0)
|
|
>>> case = DocTestCase(test)
|
|
|
|
>>> try:
|
|
... case.debug()
|
|
... except DocTestFailure as f:
|
|
... failure = f
|
|
|
|
DocTestFailure objects provide access to the test:
|
|
|
|
>>> failure.test is test
|
|
True
|
|
|
|
As well as to the example:
|
|
|
|
>>> failure.example.want
|
|
'2\n'
|
|
|
|
and the actual output:
|
|
|
|
>>> failure.got
|
|
'1\n'
|
|
|
|
"""
|
|
|
|
self.setUp()
|
|
runner = DebugRunner(optionflags=self._dt_optionflags,
|
|
checker=self._dt_checker, verbose=False)
|
|
runner.run(self._dt_test)
|
|
self.tearDown()
|
|
|
|
def id(self):
|
|
return self._dt_test.name
|
|
|
|
def __repr__(self):
|
|
name = self._dt_test.name.split('.')
|
|
return "%s (%s)" % (name[-1], '.'.join(name[:-1]))
|
|
|
|
__str__ = __repr__
|
|
|
|
def shortDescription(self):
|
|
return "Doctest: " + self._dt_test.name
|
|
|
|
def DocTestSuite(module=None, globs=None, extraglobs=None, test_finder=None,
|
|
**options):
|
|
"""
|
|
Convert doctest tests for a module to a unittest test suite.
|
|
|
|
This converts each documentation string in a module that
|
|
contains doctest tests to a unittest test case. If any of the
|
|
tests in a doc string fail, then the test case fails. An exception
|
|
is raised showing the name of the file containing the test and a
|
|
(sometimes approximate) line number.
|
|
|
|
The `module` argument provides the module to be tested. The argument
|
|
can be either a module or a module name.
|
|
|
|
If no argument is given, the calling module is used.
|
|
|
|
A number of options may be provided as keyword arguments:
|
|
|
|
setUp
|
|
A set-up function. This is called before running the
|
|
tests in each file. The setUp function will be passed a DocTest
|
|
object. The setUp function can access the test globals as the
|
|
globs attribute of the test passed.
|
|
|
|
tearDown
|
|
A tear-down function. This is called after running the
|
|
tests in each file. The tearDown function will be passed a DocTest
|
|
object. The tearDown function can access the test globals as the
|
|
globs attribute of the test passed.
|
|
|
|
globs
|
|
A dictionary containing initial global variables for the tests.
|
|
|
|
optionflags
|
|
A set of doctest option flags expressed as an integer.
|
|
"""
|
|
|
|
if test_finder is None:
|
|
test_finder = DocTestFinder()
|
|
|
|
module = _normalize_module(module)
|
|
tests = test_finder.find(module, globs=globs, extraglobs=extraglobs)
|
|
if globs is None:
|
|
globs = module.__dict__
|
|
if not tests:
|
|
# Why do we want to do this? Because it reveals a bug that might
|
|
# otherwise be hidden.
|
|
raise ValueError(module, "has no tests")
|
|
|
|
tests.sort()
|
|
suite = unittest.TestSuite()
|
|
for test in tests:
|
|
if len(test.examples) == 0:
|
|
continue
|
|
if not test.filename:
|
|
filename = module.__file__
|
|
if filename[-4:] in (".pyc", ".pyo"):
|
|
filename = filename[:-1]
|
|
test.filename = filename
|
|
suite.addTest(DocTestCase(test, **options))
|
|
|
|
return suite
|
|
|
|
class DocFileCase(DocTestCase):
|
|
|
|
def id(self):
|
|
return '_'.join(self._dt_test.name.split('.'))
|
|
|
|
def __repr__(self):
|
|
return self._dt_test.filename
|
|
__str__ = __repr__
|
|
|
|
def format_failure(self, err):
|
|
return ('Failed doctest test for %s\n File "%s", line 0\n\n%s'
|
|
% (self._dt_test.name, self._dt_test.filename, err)
|
|
)
|
|
|
|
def DocFileTest(path, module_relative=True, package=None,
|
|
globs=None, parser=DocTestParser(),
|
|
encoding=None, **options):
|
|
if globs is None:
|
|
globs = {}
|
|
else:
|
|
globs = globs.copy()
|
|
|
|
if package and not module_relative:
|
|
raise ValueError("Package may only be specified for module-"
|
|
"relative paths.")
|
|
|
|
# Relativize the path.
|
|
doc, path = _load_testfile(path, package, module_relative)
|
|
|
|
if "__file__" not in globs:
|
|
globs["__file__"] = path
|
|
|
|
# Find the file and read it.
|
|
name = os.path.basename(path)
|
|
|
|
# If an encoding is specified, use it to convert the file to unicode
|
|
if encoding is not None:
|
|
doc = doc.decode(encoding)
|
|
|
|
# Convert it to a test, and wrap it in a DocFileCase.
|
|
test = parser.get_doctest(doc, globs, name, path, 0)
|
|
return DocFileCase(test, **options)
|
|
|
|
def DocFileSuite(*paths, **kw):
|
|
"""A unittest suite for one or more doctest files.
|
|
|
|
The path to each doctest file is given as a string; the
|
|
interpretation of that string depends on the keyword argument
|
|
"module_relative".
|
|
|
|
A number of options may be provided as keyword arguments:
|
|
|
|
module_relative
|
|
If "module_relative" is True, then the given file paths are
|
|
interpreted as os-independent module-relative paths. By
|
|
default, these paths are relative to the calling module's
|
|
directory; but if the "package" argument is specified, then
|
|
they are relative to that package. To ensure os-independence,
|
|
"filename" should use "/" characters to separate path
|
|
segments, and may not be an absolute path (i.e., it may not
|
|
begin with "/").
|
|
|
|
If "module_relative" is False, then the given file paths are
|
|
interpreted as os-specific paths. These paths may be absolute
|
|
or relative (to the current working directory).
|
|
|
|
package
|
|
A Python package or the name of a Python package whose directory
|
|
should be used as the base directory for module relative paths.
|
|
If "package" is not specified, then the calling module's
|
|
directory is used as the base directory for module relative
|
|
filenames. It is an error to specify "package" if
|
|
"module_relative" is False.
|
|
|
|
setUp
|
|
A set-up function. This is called before running the
|
|
tests in each file. The setUp function will be passed a DocTest
|
|
object. The setUp function can access the test globals as the
|
|
globs attribute of the test passed.
|
|
|
|
tearDown
|
|
A tear-down function. This is called after running the
|
|
tests in each file. The tearDown function will be passed a DocTest
|
|
object. The tearDown function can access the test globals as the
|
|
globs attribute of the test passed.
|
|
|
|
globs
|
|
A dictionary containing initial global variables for the tests.
|
|
|
|
optionflags
|
|
A set of doctest option flags expressed as an integer.
|
|
|
|
parser
|
|
A DocTestParser (or subclass) that should be used to extract
|
|
tests from the files.
|
|
|
|
encoding
|
|
An encoding that will be used to convert the files to unicode.
|
|
"""
|
|
suite = unittest.TestSuite()
|
|
|
|
# We do this here so that _normalize_module is called at the right
|
|
# level. If it were called in DocFileTest, then this function
|
|
# would be the caller and we might guess the package incorrectly.
|
|
if kw.get('module_relative', True):
|
|
kw['package'] = _normalize_module(kw.get('package'))
|
|
|
|
for path in paths:
|
|
suite.addTest(DocFileTest(path, **kw))
|
|
|
|
return suite
|
|
|
|
######################################################################
|
|
## 9. Debugging Support
|
|
######################################################################
|
|
|
|
def script_from_examples(s):
|
|
r"""Extract script from text with examples.
|
|
|
|
Converts text with examples to a Python script. Example input is
|
|
converted to regular code. Example output and all other words
|
|
are converted to comments:
|
|
|
|
>>> text = '''
|
|
... Here are examples of simple math.
|
|
...
|
|
... Python has super accurate integer addition
|
|
...
|
|
... >>> 2 + 2
|
|
... 5
|
|
...
|
|
... And very friendly error messages:
|
|
...
|
|
... >>> 1/0
|
|
... To Infinity
|
|
... And
|
|
... Beyond
|
|
...
|
|
... You can use logic if you want:
|
|
...
|
|
... >>> if 0:
|
|
... ... blah
|
|
... ... blah
|
|
... ...
|
|
...
|
|
... Ho hum
|
|
... '''
|
|
|
|
>>> print(script_from_examples(text))
|
|
# Here are examples of simple math.
|
|
#
|
|
# Python has super accurate integer addition
|
|
#
|
|
2 + 2
|
|
# Expected:
|
|
## 5
|
|
#
|
|
# And very friendly error messages:
|
|
#
|
|
1/0
|
|
# Expected:
|
|
## To Infinity
|
|
## And
|
|
## Beyond
|
|
#
|
|
# You can use logic if you want:
|
|
#
|
|
if 0:
|
|
blah
|
|
blah
|
|
#
|
|
# Ho hum
|
|
<BLANKLINE>
|
|
"""
|
|
output = []
|
|
for piece in DocTestParser().parse(s):
|
|
if isinstance(piece, Example):
|
|
# Add the example's source code (strip trailing NL)
|
|
output.append(piece.source[:-1])
|
|
# Add the expected output:
|
|
want = piece.want
|
|
if want:
|
|
output.append('# Expected:')
|
|
output += ['## '+l for l in want.split('\n')[:-1]]
|
|
else:
|
|
# Add non-example text.
|
|
output += [_comment_line(l)
|
|
for l in piece.split('\n')[:-1]]
|
|
|
|
# Trim junk on both ends.
|
|
while output and output[-1] == '#':
|
|
output.pop()
|
|
while output and output[0] == '#':
|
|
output.pop(0)
|
|
# Combine the output, and return it.
|
|
# Add a courtesy newline to prevent exec from choking (see bug #1172785)
|
|
return '\n'.join(output) + '\n'
|
|
|
|
def testsource(module, name):
|
|
"""Extract the test sources from a doctest docstring as a script.
|
|
|
|
Provide the module (or dotted name of the module) containing the
|
|
test to be debugged and the name (within the module) of the object
|
|
with the doc string with tests to be debugged.
|
|
"""
|
|
module = _normalize_module(module)
|
|
tests = DocTestFinder().find(module)
|
|
test = [t for t in tests if t.name == name]
|
|
if not test:
|
|
raise ValueError(name, "not found in tests")
|
|
test = test[0]
|
|
testsrc = script_from_examples(test.docstring)
|
|
return testsrc
|
|
|
|
def debug_src(src, pm=False, globs=None):
|
|
"""Debug a single doctest docstring, in argument `src`'"""
|
|
testsrc = script_from_examples(src)
|
|
debug_script(testsrc, pm, globs)
|
|
|
|
def debug_script(src, pm=False, globs=None):
|
|
"Debug a test script. `src` is the script, as a string."
|
|
import pdb
|
|
|
|
# Note that tempfile.NameTemporaryFile() cannot be used. As the
|
|
# docs say, a file so created cannot be opened by name a second time
|
|
# on modern Windows boxes, and execfile() needs to open it.
|
|
srcfilename = tempfile.mktemp(".py", "doctestdebug")
|
|
f = open(srcfilename, 'w')
|
|
f.write(src)
|
|
f.close()
|
|
|
|
try:
|
|
if globs:
|
|
globs = globs.copy()
|
|
else:
|
|
globs = {}
|
|
|
|
if pm:
|
|
try:
|
|
execfile(srcfilename, globs, globs)
|
|
except:
|
|
print(sys.exc_info()[1])
|
|
pdb.post_mortem(sys.exc_info()[2])
|
|
else:
|
|
# Note that %r is vital here. '%s' instead can, e.g., cause
|
|
# backslashes to get treated as metacharacters on Windows.
|
|
pdb.run("execfile(%r)" % srcfilename, globs, globs)
|
|
|
|
finally:
|
|
os.remove(srcfilename)
|
|
|
|
def debug(module, name, pm=False):
|
|
"""Debug a single doctest docstring.
|
|
|
|
Provide the module (or dotted name of the module) containing the
|
|
test to be debugged and the name (within the module) of the object
|
|
with the docstring with tests to be debugged.
|
|
"""
|
|
module = _normalize_module(module)
|
|
testsrc = testsource(module, name)
|
|
debug_script(testsrc, pm, module.__dict__)
|
|
|
|
######################################################################
|
|
## 10. Example Usage
|
|
######################################################################
|
|
class _TestClass:
|
|
"""
|
|
A pointless class, for sanity-checking of docstring testing.
|
|
|
|
Methods:
|
|
square()
|
|
get()
|
|
|
|
>>> _TestClass(13).get() + _TestClass(-12).get()
|
|
1
|
|
>>> hex(_TestClass(13).square().get())
|
|
'0xa9'
|
|
"""
|
|
|
|
def __init__(self, val):
|
|
"""val -> _TestClass object with associated value val.
|
|
|
|
>>> t = _TestClass(123)
|
|
>>> print(t.get())
|
|
123
|
|
"""
|
|
|
|
self.val = val
|
|
|
|
def square(self):
|
|
"""square() -> square TestClass's associated value
|
|
|
|
>>> _TestClass(13).square().get()
|
|
169
|
|
"""
|
|
|
|
self.val = self.val ** 2
|
|
return self
|
|
|
|
def get(self):
|
|
"""get() -> return TestClass's associated value.
|
|
|
|
>>> x = _TestClass(-42)
|
|
>>> print(x.get())
|
|
-42
|
|
"""
|
|
|
|
return self.val
|
|
|
|
__test__ = {"_TestClass": _TestClass,
|
|
"string": r"""
|
|
Example of a string object, searched as-is.
|
|
>>> x = 1; y = 2
|
|
>>> x + y, x * y
|
|
(3, 2)
|
|
""",
|
|
|
|
"bool-int equivalence": r"""
|
|
In 2.2, boolean expressions displayed
|
|
0 or 1. By default, we still accept
|
|
them. This can be disabled by passing
|
|
DONT_ACCEPT_TRUE_FOR_1 to the new
|
|
optionflags argument.
|
|
>>> 4 == 4
|
|
1
|
|
>>> 4 == 4
|
|
True
|
|
>>> 4 > 4
|
|
0
|
|
>>> 4 > 4
|
|
False
|
|
""",
|
|
|
|
"blank lines": r"""
|
|
Blank lines can be marked with <BLANKLINE>:
|
|
>>> print('foo\n\nbar\n')
|
|
foo
|
|
<BLANKLINE>
|
|
bar
|
|
<BLANKLINE>
|
|
""",
|
|
|
|
"ellipsis": r"""
|
|
If the ellipsis flag is used, then '...' can be used to
|
|
elide substrings in the desired output:
|
|
>>> print(range(1000)) #doctest: +ELLIPSIS
|
|
[0, 1, 2, ..., 999]
|
|
""",
|
|
|
|
"whitespace normalization": r"""
|
|
If the whitespace normalization flag is used, then
|
|
differences in whitespace are ignored.
|
|
>>> print(range(30)) #doctest: +NORMALIZE_WHITESPACE
|
|
[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
|
|
15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
|
|
27, 28, 29]
|
|
""",
|
|
}
|
|
|
|
def _test():
|
|
testfiles = [arg for arg in sys.argv[1:] if arg and arg[0] != '-']
|
|
if testfiles:
|
|
for filename in testfiles:
|
|
if filename.endswith(".py"):
|
|
# It is a module -- insert its dir into sys.path and try to
|
|
# import it. If it is part of a package, that possibly won't work
|
|
# because of package imports.
|
|
dirname, filename = os.path.split(filename)
|
|
sys.path.insert(0, dirname)
|
|
m = __import__(filename[:-3])
|
|
del sys.path[0]
|
|
testmod(m)
|
|
else:
|
|
testfile(filename, module_relative=False)
|
|
else:
|
|
r = unittest.TextTestRunner()
|
|
r.run(DocTestSuite())
|
|
|
|
if __name__ == "__main__":
|
|
_test()
|