summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_pydoc.py
diff options
context:
space:
mode:
authorCharles-François Natali <cf.natali@gmail.com>2014-06-20 22:00:22 (GMT)
committerCharles-François Natali <cf.natali@gmail.com>2014-06-20 22:00:22 (GMT)
commitca7e5d3e1dd2ac82abfa425817180cdc7985d3de (patch)
tree5ad222164c29a61d3255967b215fe01c7b36ca02 /Lib/test/test_pydoc.py
parent120bb115b65a587be5e43446d606d8f6c1625df7 (diff)
parent8aa9e4268fae4646b40d230962d74a6b61397217 (diff)
downloadcpython-ca7e5d3e1dd2ac82abfa425817180cdc7985d3de.zip
cpython-ca7e5d3e1dd2ac82abfa425817180cdc7985d3de.tar.gz
cpython-ca7e5d3e1dd2ac82abfa425817180cdc7985d3de.tar.bz2
Fix test_pydoc failure introduced by cddb17c4975e. Patch by Berker Peksag.
Diffstat (limited to 'Lib/test/test_pydoc.py')
-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