From: Charles-François Natali <cf.natali@gmail.com>
Date: Fri, 20 Jun 2014 21:57:19 +0000 (+0100)
Subject: Fix test_pydoc failure introduced by e89c39125892. Patch by Berker Peksag.
X-Git-Tag: v2.7.8~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94919a44a26b135108788f5a7bd5604189c3febe;p=python

Fix test_pydoc failure introduced by e89c39125892. Patch by Berker Peksag.
---

diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index 6d27a3021d..c11c06b524 100644
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -14,8 +14,8 @@ import types
 import test.test_support
 from collections import namedtuple
 from test.script_helper import assert_python_ok
-from test.test_support import (
-    TESTFN, rmtree, reap_children, captured_stdout, captured_stderr)
+from test.test_support import (TESTFN, rmtree, reap_children, captured_stdout,
+                               captured_stderr, requires_docstrings)
 
 from test import pydoc_mod
 
@@ -300,6 +300,7 @@ class PydocBaseTest(unittest.TestCase):
 
 class PydocDocTest(unittest.TestCase):
 
+    @requires_docstrings
     @unittest.skipIf(sys.flags.optimize >= 2,
                      "Docstrings are omitted with -O2 and above")
     def test_html_doc(self):
@@ -317,6 +318,7 @@ class PydocDocTest(unittest.TestCase):
             print_diffs(expected_html, result)
             self.fail("outputs are not equal, see diff above")
 
+    @requires_docstrings
     @unittest.skipIf(sys.flags.optimize >= 2,
                      "Docstrings are omitted with -O2 and above")
     def test_text_doc(self):