From 624a74e4b775c93293f5dece9f6ed8407d2aec9f Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Sun, 27 Oct 2013 14:19:12 +1000 Subject: [PATCH] Mitigate #19412: restore test skips for --without-doc-strings --- Lib/test/support/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 1b20fa7aabe..23d015c15f1 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -1703,7 +1703,12 @@ def run_unittest(*classes): def _check_docstrings(): """Just used to check if docstrings are enabled""" -HAVE_DOCSTRINGS = (_check_docstrings.__doc__ is not None) +MISSING_C_DOCSTRINGS = (check_impl_detail() and + sys.platform != 'win32' and + not sysconfig.get_config_var('WITH_DOC_STRINGS')) + +HAVE_DOCSTRINGS = (_check_docstrings.__doc__ is not None and + not MISSING_C_DOCSTRINGS) requires_docstrings = unittest.skipUnless(HAVE_DOCSTRINGS, "test requires docstrings")