From: Tim Peters Date: Mon, 24 Apr 2006 02:07:13 +0000 (+0000) Subject: Merge rev 45677 from the trunk. X-Git-Tag: v2.4.4c1~248 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca7841cc22c817d69fc9c0a53eaeef97472e55bf;p=thirdparty%2FPython%2Fcpython.git Merge rev 45677 from the trunk. Bug #1337990: clarified that ``doctest`` does not support examples requiring both expected output and an exception. --- diff --git a/Doc/lib/libdoctest.tex b/Doc/lib/libdoctest.tex index f5560f564515..f837d7facc09 100644 --- a/Doc/lib/libdoctest.tex +++ b/Doc/lib/libdoctest.tex @@ -407,10 +407,13 @@ You can force use of your own dict as the execution context by passing \subsubsection{What About Exceptions?\label{doctest-exceptions}} No problem, provided that the traceback is the only output produced by -the example: just paste in the traceback. Since tracebacks contain -details that are likely to change rapidly (for example, exact file paths -and line numbers), this is one case where doctest works hard to be -flexible in what it accepts. +the example: just paste in the traceback.\footnote{Examples containing + both expected output and an exception are not supported. Trying + to guess where one ends and the other begins is too error-prone, + and that also makes for a confusing test.} +Since tracebacks contain details that are likely to change rapidly (for +example, exact file paths and line numbers), this is one case where doctest +works hard to be flexible in what it accepts. Simple example: diff --git a/Misc/NEWS b/Misc/NEWS index d25638583f25..f647d1f40501 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -54,6 +54,12 @@ Build - Fix test_long failure on Tru64 with gcc by using -mieee gcc option. +Documentation +------------- + +- Bug #1337990: clarified that ``doctest`` does not support examples + requiring both expected output and an exception. + What's New in Python 2.4.3? ===========================