summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-06 14:56:43 (GMT)
committerGeorg Brandl <georg@python.org>2014-10-06 14:56:43 (GMT)
commit7fa4a8f15a812a630aa764de584efbe5242c9bb3 (patch)
treed874b52b113f9978d3f8a48b731bf96aa4d6eee5 /Doc
parent4dd27a3edba94d2f75cd234b67f109cf98aa76b6 (diff)
downloadcpython-7fa4a8f15a812a630aa764de584efbe5242c9bb3.zip
cpython-7fa4a8f15a812a630aa764de584efbe5242c9bb3.tar.gz
cpython-7fa4a8f15a812a630aa764de584efbe5242c9bb3.tar.bz2
Closes #12148: clarify "or's together option flags" in doctest docs.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/doctest.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
index 50626e9..2e372de 100644
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -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
@@ -1097,7 +1097,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