summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles-François Natali <cf.natali@gmail.com>2014-06-20 21:59:12 (GMT)
committerCharles-François Natali <cf.natali@gmail.com>2014-06-20 21:59:12 (GMT)
commit57398c31c40972e4cba4bde8c431a66f5ca6f77e (patch)
tree2db2666e004454aa6cb92e525c7fb81427be7185
parent504f5c36ef2419cb0c56450c3a733499c4576456 (diff)
downloadcpython-57398c31c40972e4cba4bde8c431a66f5ca6f77e.zip
cpython-57398c31c40972e4cba4bde8c431a66f5ca6f77e.tar.gz
cpython-57398c31c40972e4cba4bde8c431a66f5ca6f77e.tar.bz2
Fix test_pydoc failure introduced by 7aa72075d440. Patch by Berker Peksag.
-rw-r--r--Lib/test/test_pydoc.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index 8d85c14..3bce66e 100644
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -402,6 +402,7 @@ class PydocDocTest(unittest.TestCase):
"Docstrings are omitted with -O2 and above")
@unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(),
'trace function introduces __locals__ unexpectedly')
+ @requires_docstrings
def test_html_doc(self):
result, doc_loc = get_pydoc_html(pydoc_mod)
mod_file = inspect.getabsfile(pydoc_mod)
@@ -421,6 +422,7 @@ class PydocDocTest(unittest.TestCase):
"Docstrings are omitted with -O2 and above")
@unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(),
'trace function introduces __locals__ unexpectedly')
+ @requires_docstrings
def test_text_doc(self):
result, doc_loc = get_pydoc_text(pydoc_mod)
expected_text = expected_text_pattern % (
@@ -495,6 +497,7 @@ class PydocDocTest(unittest.TestCase):
'Docstrings are omitted with -O2 and above')
@unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(),
'trace function introduces __locals__ unexpectedly')
+ @requires_docstrings
def test_help_output_redirect(self):
# issue 940286, if output is set in Helper, then all output from
# Helper.help should be redirected