[Python-checkins] cpython (merge 3.4 -> default): Fix test_pydoc failure introduced by cddb17c4975e. Patch by Berker Peksag.

[charles-francois.natali]

http://hg.python.org/cpython/rev/3d9e35137641
changeset:   91304:3d9e35137641
parent:      91300:f23edd061d89
parent:      91303:9c5e9e2e0a09
user:        Charles-François Natali <cf.natali at gmail.com>
date:        Fri Jun 20 23:00:22 2014 +0100
summary:
  Fix test_pydoc failure introduced by cddb17c4975e. Patch by Berker Peksag.

files:
  Lib/test/test_pydoc.py |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -402,6 +402,7 @@
                      "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 @@
                      "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 @@
                      '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

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