merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-06 16:57:02 +02:00
commit 1f6afef2ea

View File

@ -865,8 +865,8 @@ and :ref:`doctest-simple-testfile`.
nothing at the end. In verbose mode, the summary is detailed, else the summary
is very brief (in fact, empty if all tests passed).
Optional argument *optionflags* or's together option flags. See section
:ref:`doctest-options`.
Optional argument *optionflags* (default value 0) takes the bitwise-or of
option flags. See section :ref:`doctest-options`.
Optional argument *raise_on_error* defaults to false. If true, an exception is
raised upon the first failure or unexpected exception in an example. This
@ -1091,7 +1091,7 @@ reporting flags specific to :mod:`unittest` support, via this function:
Set the :mod:`doctest` reporting flags to use.
Argument *flags* or's together option flags. See section
Argument *flags* takes the bitwise-or of option flags. See section
:ref:`doctest-options`. Only "reporting flags" can be used.
This is a module-global setting, and affects all future doctests run by module