(Merge 3.2) test_pydoc: skip PydocServerTest if thread support is disabled
diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index 6dca0c9..7d17a98 100644
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -20,6 +20,11 @@
from test import pydoc_mod
+try:
+ import threading
+except ImportError:
+ threading = None
+
# Just in case sys.modules["test"] has the optional attribute __loader__.
if hasattr(pydoc_mod, "__loader__"):
del pydoc_mod.__loader__
@@ -409,6 +414,7 @@
self.assertIn(expected, pydoc.render_doc(c))
+@unittest.skipUnless(threading, 'Threading required for this test.')
class PydocServerTest(unittest.TestCase):
"""Tests for pydoc._start_server"""