lib2to3 tests: Don't use deprecated API, switch to assertRegex()

diff --git a/Lib/lib2to3/tests/test_main.py b/Lib/lib2to3/tests/test_main.py
index 407afa11d13be4564b8b1b92eca5ec1c8b79d79b..a3dbced9a438d4e277976c04efe5641aebe1db17 100644 (file)
--- a/Lib/lib2to3/tests/test_main.py
+++ b/Lib/lib2to3/tests/test_main.py
@@ -94,7 +94,7 @@ class TestMain(unittest.TestCase):
             self.assertIn("Writing converted %s to %s" % (
                     os.path.join(self.py2_src_dir, name),
                     os.path.join(self.py3_dest_dir, name+suffix)), stderr)
-        self.assertRegexpMatches(stderr, r"No changes to .*/__init__\.py")
+        self.assertRegex(stderr, r"No changes to .*/__init__\.py")
         self.assertNotRegex(stderr, r"No changes to .*/trivial\.py")
 
     def test_filename_changing_on_output_two_files(self):

diff --git a/Lib/lib2to3/tests/test_refactor.py b/Lib/lib2to3/tests/test_refactor.py
index 4b87ed65442a3c153e8190a996c77a0b6b2387e3..8bdebc1f3da22852cd8ee64ee6a7c9982a3b467f 100644 (file)
--- a/Lib/lib2to3/tests/test_refactor.py
+++ b/Lib/lib2to3/tests/test_refactor.py
@@ -230,7 +230,7 @@ from __future__ import print_function"""
                 os.sep, os.path.basename(test_file))
         for message in debug_messages:
             if "Not writing changes" in message:
-                self.assertRegexpMatches(message, message_regex)
+                self.assertRegex(message, message_regex)
                 break
         else:
             self.fail("%r not matched in %r" % (message_regex, debug_messages))