[Python-checkins] cpython (2.7): Issue #29371: Clarify bitwise OR operation in doctest option flags.

[mariatta.wijaya]

https://hg.python.org/cpython/rev/3fd198b80f29
changeset:   106459:3fd198b80f29
branch:      2.7
parent:      106409:110ec861e5ea
user:        Mariatta Wijaya <mariatta.wijaya at gmail.com>
date:        Mon Feb 06 20:30:10 2017 -0800
summary:
  Issue #29371: Clarify bitwise OR operation in doctest option flags.

files:
  Doc/library/doctest.rst |  13 +++++++------
  1 files changed, 7 insertions(+), 6 deletions(-)


diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -530,8 +530,8 @@
 
 A number of option flags control various aspects of doctest's behavior.
 Symbolic names for the flags are supplied as module constants, which can be
-or'ed together and passed to various functions.  The names can also be used in
-:ref:`doctest directives <doctest-directives>`.
+:ref:`bitwise ORed <bitwise>` together and passed to various functions.
+The names can also be used in :ref:`doctest directives <doctest-directives>`.
 
 The first group of options define test semantics, controlling aspects of how
 doctest decides whether actual output matches an example's expected output:
@@ -1161,10 +1161,11 @@
    the option flags specified for the test case when the :class:`DocTestCase`
    instance was constructed.  If no reporting flags were specified (which is the
    typical and expected case), :mod:`doctest`'s :mod:`unittest` reporting flags are
-   or'ed into the option flags, and the option flags so augmented are passed to the
-   :class:`DocTestRunner` instance created to run the doctest.  If any reporting
-   flags were specified when the :class:`DocTestCase` instance was constructed,
-   :mod:`doctest`'s :mod:`unittest` reporting flags are ignored.
+   :ref:`bitwise ORed <bitwise>` into the option flags, and the option flags
+   so augmented are passed to the :class:`DocTestRunner` instance created to
+   run the doctest.  If any reporting flags were specified when the
+   :class:`DocTestCase` instance was constructed, :mod:`doctest`'s
+   :mod:`unittest` reporting flags are ignored.
 
    The value of the :mod:`unittest` reporting flags in effect before the function
    was called is returned by the function.

-- 
Repository URL: https://hg.python.org/cpython