Don't use deprecated functions in tests

3 files changed, 17 insertions, 10 deletions

diff --git a/tests/__init__.py b/tests/__init__.py
index 7903a95..dd5086b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,13 +1,16 @@
 import aioeventlet
+import sys
 try:
     import asyncio
 except ImportError:
     import trollius as asyncio
 try:
     # On Python 2.6, unittest2 is needed to get new features like addCleanup()
-    import unittest2 as unittest
+    import unittest2
+    unittest = unittest2
 except ImportError:
     import unittest
+    unittest2 = None
 try:
     from unittest import mock
 except ImportError:
@@ -22,3 +25,7 @@ class TestCase(unittest.TestCase):
         self.loop = policy.get_event_loop()
         self.addCleanup(self.loop.close)
         self.addCleanup(asyncio.set_event_loop, None)
+
+    if sys.version_info < (3,) and unittest2 is None:
+        def assertRaisesRegex(self, *args):
+            return self.assertRaisesRegexp(*args)
diff --git a/tests/test_eventlet.py b/tests/test_eventlet.py
index 799a676..8f67d78 100644
--- a/tests/test_eventlet.py
+++ b/tests/test_eventlet.py
@@ -292,7 +292,7 @@ class WrapGreenthreadTests(tests.TestCase):
         self.loop.set_debug(False)
         gt = eventlet.spawn(func)
         msg = "wrap_greenthread: the greenthread is running"
-        self.assertRaisesRegexp(RuntimeError, msg, gt.wait)
+        self.assertRaisesRegex(RuntimeError, msg, gt.wait)
 
     def test_wrap_greenthread_dead(self):
         def func():
@@ -303,8 +303,8 @@ class WrapGreenthreadTests(tests.TestCase):
         self.assertEqual(result, 'ok')
 
         msg = "wrap_greenthread: the greenthread already finished"
-        self.assertRaisesRegexp(RuntimeError, msg,
-                                aioeventlet.wrap_greenthread, gt)
+        self.assertRaisesRegex(RuntimeError, msg,
+                               aioeventlet.wrap_greenthread, gt)
 
     def test_coro_wrap_greenthread(self):
         result = self.loop.run_until_complete(coro_wrap_greenthread())
@@ -358,7 +358,7 @@ class WrapGreenletTests(tests.TestCase):
 
         eventlet.spawn_n(func)
         msg = "wrap_greenthread: the greenthread is running"
-        self.assertRaisesRegexp(RuntimeError, msg, event.wait)
+        self.assertRaisesRegex(RuntimeError, msg, event.wait)
 
     def test_wrap_greenlet_dead(self):
         event = eventlet.event.Event()
@@ -368,7 +368,7 @@ class WrapGreenletTests(tests.TestCase):
         gt = eventlet.spawn_n(func)
         event.wait()
         msg = "wrap_greenthread: the greenthread already finished"
-        self.assertRaisesRegexp(RuntimeError, msg, aioeventlet.wrap_greenthread, gt)
+        self.assertRaisesRegex(RuntimeError, msg, aioeventlet.wrap_greenthread, gt)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_greenlet.py b/tests/test_greenlet.py
index 5a4f491..ded3cb6 100644
--- a/tests/test_greenlet.py
+++ b/tests/test_greenlet.py
@@ -26,8 +26,8 @@ class WrapGreenletTests(tests.TestCase):
     def test_wrap_greenlet_no_run_attr(self):
         gl = greenlet.greenlet()
         msg = "wrap_greenthread: the run attribute of the greenlet is not set"
-        self.assertRaisesRegexp(RuntimeError, msg,
-                                aioeventlet.wrap_greenthread, gl)
+        self.assertRaisesRegex(RuntimeError, msg,
+                               aioeventlet.wrap_greenthread, gl)
 
     def test_wrap_greenlet_running(self):
         def func(value):
@@ -36,7 +36,7 @@ class WrapGreenletTests(tests.TestCase):
 
         gl = greenlet.greenlet(func)
         msg = "wrap_greenthread: the greenthread is running"
-        self.assertRaisesRegexp(RuntimeError, msg, gl.switch, 5)
+        self.assertRaisesRegex(RuntimeError, msg, gl.switch, 5)
 
     def test_wrap_greenlet_dead(self):
         def func(value):
@@ -45,7 +45,7 @@ class WrapGreenletTests(tests.TestCase):
         gl = greenlet.greenlet(func)
         gl.switch(5)
         msg = "wrap_greenthread: the greenthread already finished"
-        self.assertRaisesRegexp(RuntimeError, msg, aioeventlet.wrap_greenthread, gl)
+        self.assertRaisesRegex(RuntimeError, msg, aioeventlet.wrap_greenthread, gl)
 
 
 if __name__ == '__main__':