diff -r 523f309cf558 Lib/ctypes/test/test_win32.py --- a/Lib/ctypes/test/test_win32.py Sat Jan 26 13:31:44 2013 +0100 +++ b/Lib/ctypes/test/test_win32.py Sat Jan 26 16:19:23 2013 +0200 @@ -3,6 +3,7 @@ from ctypes import * from ctypes.test import is_resource_enabled import unittest, sys +import sysconfig import _ctypes_test @@ -60,7 +61,9 @@ def test_COMError(self): from _ctypes import COMError - self.assertEqual(COMError.__doc__, "Raised when a COM method call failed.") + if sysconfig.get_config_var('WITH_DOC_STRINGS'): + self.assertEqual(COMError.__doc__, + "Raised when a COM method call failed.") ex = COMError(-1, "text", ("details",)) self.assertEqual(ex.hresult, -1) diff -r 523f309cf558 Lib/distutils/tests/test_build_ext.py --- a/Lib/distutils/tests/test_build_ext.py Sat Jan 26 13:31:44 2013 +0100 +++ b/Lib/distutils/tests/test_build_ext.py Sat Jan 26 16:19:23 2013 +0200 @@ -2,6 +2,7 @@ import os from StringIO import StringIO import textwrap +import sysconfig from distutils.core import Extension, Distribution from distutils.command.build_ext import build_ext @@ -77,8 +78,9 @@ self.assertEqual(xx.foo(2, 5), 7) self.assertEqual(xx.foo(13,15), 28) self.assertEqual(xx.new().demo(), None) - doc = 'This is a template module just for instruction.' - self.assertEqual(xx.__doc__, doc) + if sysconfig.get_config_var('WITH_DOC_STRINGS'): + doc = 'This is a template module just for instruction.' + self.assertEqual(xx.__doc__, doc) self.assertTrue(isinstance(xx.Null(), xx.Null)) self.assertTrue(isinstance(xx.Str(), xx.Str)) diff -r 523f309cf558 Lib/test/test_functools.py --- a/Lib/test/test_functools.py Sat Jan 26 13:31:44 2013 +0100 +++ b/Lib/test/test_functools.py Sat Jan 26 16:19:23 2013 +0200 @@ -196,6 +196,7 @@ self.assertEqual(wrapper.__name__, 'f') self.assertEqual(wrapper.attr, 'This is also a test') + @test_support.requires_docstrings @unittest.skipIf(sys.flags.optimize >= 2, "Docstrings are omitted with -O2 and above") def test_default_update_doc(self): diff -r 523f309cf558 Lib/test/test_pydoc.py --- a/Lib/test/test_pydoc.py Sat Jan 26 13:31:44 2013 +0100 +++ b/Lib/test/test_pydoc.py Sat Jan 26 16:19:23 2013 +0200 @@ -10,12 +10,21 @@ import xml.etree import test.test_support from collections import namedtuple +import sysconfig from test.script_helper import assert_python_ok from test.test_support import ( TESTFN, rmtree, reap_children, captured_stdout) from test import pydoc_mod +if sysconfig.get_config_var('WITH_DOC_STRINGS'): + expected_data_docstrings = ( + 'dictionary for instance variables (if defined)', + 'list of weak references to the object (if defined)', + ) +else: + expected_data_docstrings = ('', '', '', '') + expected_text_pattern = \ """ NAME @@ -40,11 +49,9 @@ class B(__builtin__.object) | Data descriptors defined here: |\x20\x20 - | __dict__ - | dictionary for instance variables (if defined) + | __dict__%s |\x20\x20 - | __weakref__ - | list of weak references to the object (if defined) + | __weakref__%s |\x20\x20 | ---------------------------------------------------------------------- | Data and other attributes defined here: @@ -75,6 +82,9 @@ Nobody """.strip() +expected_text_data_docstrings = tuple('\n | ' + s if s else '' + for s in expected_data_docstrings) + expected_html_pattern = \ """
Data descriptors defined here:
Data and other attributes defined here: @@ -168,6 +178,8 @@ | Nobody |