From: Charles-François Natali <cf.natali@gmail.com>
Date: Fri, 20 Jun 2014 21:59:12 +0000 (+0100)
Subject: Fix test_pydoc failure introduced by 7aa72075d440. Patch by Berker Peksag.
X-Git-Tag: v3.4.2rc1~349
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57398c31c40972e4cba4bde8c431a66f5ca6f77e;p=python

Fix test_pydoc failure introduced by 7aa72075d440. Patch by Berker Peksag.
---

diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index 8d85c14071..3bce66e828 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