The mutex module has been deprecated for removal in 3.0.
diff --git a/Lib/test/test_mutex.py b/Lib/test/test_mutex.py
index 6318c70..15e5449 100644
--- a/Lib/test/test_mutex.py
+++ b/Lib/test/test_mutex.py
@@ -1,8 +1,8 @@
-import mutex
-
import unittest
import test.test_support
+mutex = test.test_support.import_module("mutex", deprecated=True)
+
class MutexTest(unittest.TestCase):
def setUp(self):
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 0b0b92d..7e284e5 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -126,7 +126,7 @@
class TestStdlibRemovals(unittest.TestCase):
- all_platforms = ('audiodev', 'imputil')
+ all_platforms = ('audiodev', 'imputil', 'mutex')
def check_removal(self, module_name):
"""Make sure the specified module, when imported, raises a
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 04a0ab8..fe5cf0f 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -37,6 +37,19 @@
and unexpected skips.
"""
+def import_module(name, deprecated=False):
+ """Import the module to be tested, raising TestSkipped if it is not
+ available."""
+ with catch_warning():
+ if deprecated:
+ warnings.filterwarnings("ignore", ".+ module", DeprecationWarning)
+ try:
+ module = __import__(name, level=0)
+ except ImportError:
+ raise TestSkipped("No module named " + name)
+ else:
+ return module
+
verbose = 1 # Flag set to 0 by regrtest.py
use_resources = None # Flag set to [] by regrtest.py
max_memuse = 0 # Disable bigmem tests (they will still be run with