python bindings: fix DeprecationWarning
authorNick Desaulniers <ndesaulniers@google.com>
Mon, 10 Aug 2020 22:25:20 +0000 (15:25 -0700)
committerNick Desaulniers <ndesaulniers@google.com>
Mon, 10 Aug 2020 22:25:23 +0000 (15:25 -0700)
Fixes observed warning running `ninja check-all`:
llvm-project/clang/bindings/python/tests/cindex/test_diagnostics.py:100:
DeprecationWarning: Please use assertRegex instead.
  self.assertRegexpMatches(children[0].spelling

Looks like unittest.assertRegexpMatches has been deprecated in favor of
unittest.assertRegex since Python 3.2, according to:
https://docs.python.org/3/library/unittest.html#deprecated-aliases

Reviewed By: MaskRay

Differential Revision: https://reviews.llvm.org/D85692

clang/bindings/python/tests/cindex/test_diagnostics.py

index 64d0ca2..8b0f042 100644 (file)
@@ -41,7 +41,7 @@ class TestDiagnostics(unittest.TestCase):
         self.assertEqual(tu.diagnostics[0].severity, Diagnostic.Warning)
         self.assertEqual(tu.diagnostics[0].location.line, 1)
         self.assertEqual(tu.diagnostics[0].location.column, 26)
-        self.assertRegexpMatches(tu.diagnostics[0].spelling,
+        self.assertRegex(tu.diagnostics[0].spelling,
             'use of GNU old-style.*')
         self.assertEqual(len(tu.diagnostics[0].fixits), 1)
         self.assertEqual(tu.diagnostics[0].fixits[0].range.start.line, 1)
@@ -56,7 +56,7 @@ class TestDiagnostics(unittest.TestCase):
         self.assertEqual(tu.diagnostics[0].severity, Diagnostic.Warning)
         self.assertEqual(tu.diagnostics[0].location.line, 1)
         self.assertEqual(tu.diagnostics[0].location.column, 16)
-        self.assertRegexpMatches(tu.diagnostics[0].spelling,
+        self.assertRegex(tu.diagnostics[0].spelling,
             'incompatible pointer to.*')
         self.assertEqual(len(tu.diagnostics[0].fixits), 0)
         self.assertEqual(len(tu.diagnostics[0].ranges), 1)
@@ -97,7 +97,7 @@ class TestDiagnostics(unittest.TestCase):
         children = d.children
         self.assertEqual(len(children), 1)
         self.assertEqual(children[0].severity, Diagnostic.Note)
-        self.assertRegexpMatches(children[0].spelling,
+        self.assertRegex(children[0].spelling,
                 '.*declared here')
         self.assertEqual(children[0].location.line, 1)
         self.assertEqual(children[0].location.column, 6)