Backwards compat unittest regex assertions

Signed-off-by: javrin <jawabiscuit@users.noreply.github.com>
AcademySoftwareFoundation · Sep 15, 2023 · 89fa4ac · 89fa4ac
1 parent 519c462
commit 89fa4ac
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/rez/tests/test_utils.py b/src/rez/tests/test_utils.py
@@ -157,14 +157,14 @@ def test_already_posix_style_paths(self):
         )
         self.assertEqual(
             cygpath.to_posix_path("/d/projects/python"), "/d/projects/python")
-        self.assertRaisesRegexp(
+        self.assertRaisesRegex(
             ValueError,
             "Cannot convert path to posix path: '.*' "
             "Please ensure that the path is absolute",
             cygpath.to_posix_path,
             "/home/john/documents"
         )
-        self.assertRaisesRegexp(
+        self.assertRaisesRegex(
             ValueError,
             "Cannot convert path to posix path: '.*' "
             "Please ensure that the path is absolute",
@@ -174,15 +174,15 @@ def test_already_posix_style_paths(self):
 
     @platform_dependent(["windows"])
     def test_relative_paths(self):
-        self.assertRaisesRegexp(
+        self.assertRaisesRegex(
             ValueError,
             "Cannot convert path to posix path: '.*' "
             "Please ensure that the path is absolute",
             cygpath.to_posix_path,
             "jane/documents"
         )
 
-        self.assertRaisesRegexp(
+        self.assertRaisesRegex(
             ValueError,
             "Cannot convert path to posix path: '.*' "
             "Please ensure that the path is absolute",
@@ -222,14 +222,14 @@ def test_windows_malformed_paths(self):
         self.assertEqual(
             cygpath.to_posix_path("D:\\projects/python"), "/d/projects/python"
         )
-        self.assertRaisesRegexp(
+        self.assertRaisesRegex(
             ValueError,
             "Cannot convert path to posix path: '.*' "
             "This is most likely due to a malformed path",
             cygpath.to_posix_path,
             "D:\\..\\Projects"
         )
-        self.assertRaisesRegexp(
+        self.assertRaisesRegex(
             ValueError,
             "Cannot convert path to posix path: '.*' "
             "This is most likely due to a malformed path",
@@ -245,7 +245,7 @@ def test_dotted_paths(self):
         self.assertEqual(cygpath.to_posix_path(
             "/c/users/./jane"), "/c/users/jane"
         )
-        self.assertRaisesRegexp(
+        self.assertRaisesRegex(
             ValueError,
             "Cannot convert path to posix path: '.*' "
             "Please ensure that the path is absolute",
@@ -349,23 +349,23 @@ def test_paths_with_mixed_slashes(self):
 
     @platform_dependent(["windows"])
     def test_paths_with_no_drive_letter(self):
-        self.assertRaisesRegexp(
+        self.assertRaisesRegex(
             ValueError,
             "Cannot convert path to mixed path: '.*' "
             "Please ensure that the path is absolute",
             cygpath.to_mixed_path,
             '\\foo\\bar'
         )
 
-        self.assertRaisesRegexp(
+        self.assertRaisesRegex(
             ValueError,
             "Cannot convert path to mixed path: '.*' "
             "Please ensure that the path is absolute",
             cygpath.to_mixed_path,
             '\\\\my_folder\\my_file.txt'
         )
 
-        self.assertRaisesRegexp(
+        self.assertRaisesRegex(
             ValueError,
             "Cannot convert path to mixed path: '.*' "
             "Please ensure that the path is absolute",
@@ -387,7 +387,7 @@ def test_dotted_paths(self):
         self.assertEqual(cygpath.to_mixed_path(
             "C:/users/./jane"), "C:/users/jane"
         )
-        self.assertRaisesRegexp(
+        self.assertRaisesRegex(
             ValueError,
             "Cannot convert path to posix path: '.*' "
             "Please ensure that the path is absolute",

diff --git a/src/rez/tests/util.py b/src/rez/tests/util.py
@@ -28,6 +28,14 @@
 except ImportError:
     use_parameterized = False
 
+# For py2 backwards compatibility
+if not hasattr(unittest.TestCase, 'assertRaisesRegex'):
+    setattr(
+        unittest.TestCase,
+        'assertRaisesRegex',
+        unittest.TestCase.assertRaisesRegexp
+    )
+
 
 class TestBase(unittest.TestCase):
     """Unit test base class."""