[Python-checkins] cpython: Mitigate #19412: restore test skips for --without-doc-strings

[nick.coghlan]

http://hg.python.org/cpython/rev/1927b7c01c78
changeset:   86668:1927b7c01c78
parent:      86662:f5c729dbe9fb
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Oct 27 14:19:12 2013 +1000
summary:
  Mitigate #19412: restore test skips for --without-doc-strings

files:
  Lib/test/support/__init__.py |  7 ++++++-
  1 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -1703,7 +1703,12 @@
 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")

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