changeset 74917:76dfd1f08025

lib2to3 tests: Don't use deprecated API, switch to assertRegex()
author Victor Stinner <victor.stinner@haypocalc.com>
date Mon, 13 Feb 2012 23:31:26 +0100
parents 80a50b7ad88f
children af1a9508f7fa
files Lib/lib2to3/tests/test_main.py Lib/lib2to3/tests/test_refactor.py
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Lib/lib2to3/tests/test_main.py	Mon Feb 13 20:28:46 2012 +0200
+++ b/Lib/lib2to3/tests/test_main.py	Mon Feb 13 23:31:26 2012 +0100
@@ -94,7 +94,7 @@
             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):
--- a/Lib/lib2to3/tests/test_refactor.py	Mon Feb 13 20:28:46 2012 +0200
+++ b/Lib/lib2to3/tests/test_refactor.py	Mon Feb 13 23:31:26 2012 +0100
@@ -230,7 +230,7 @@
                 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))