Merge 3.3.

This commit is contained in:
Stefan Krah 2013-01-26 13:07:36 +01:00
commit c4a10f5970
2 changed files with 5 additions and 0 deletions

View file

@ -597,6 +597,10 @@ def _is_ipv6_enabled():
requires_lzma = unittest.skipUnless(lzma, 'requires lzma')
requires_docstrings = unittest.skipUnless(
sysconfig.get_config_var('WITH_DOC_STRINGS'),
"test requires docstrings")
is_jython = sys.platform.startswith('java')
# Filename used for testing