This is an archive of the discontinued LLVM Phabricator instance.

Differential D85692

python bindings: fix DeprecationWarning
ClosedPublic

Authored by nickdesaulniers on Aug 10 2020, 3:22 PM.

Details

Reviewers
MaskRay
echristo
srhines
Commits
rG05d74dbc3bb1: python bindings: fix DeprecationWarning
Summary

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

Diff Detail

Event Timeline

nickdesaulniers created this revision.Aug 10 2020, 3:22 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 10 2020, 3:22 PM
Herald added subscribers: cfe-commits, arphaman. · View Herald Transcript
nickdesaulniers requested review of this revision.Aug 10 2020, 3:22 PM
MaskRay accepted this revision.Aug 10 2020, 3:23 PM

Thanks!

This revision is now accepted and ready to land.Aug 10 2020, 3:23 PM
This revision was landed with ongoing or failed builds.Aug 10 2020, 3:25 PM
Closed by commit rG05d74dbc3bb1: python bindings: fix DeprecationWarning (authored by nickdesaulniers). · Explain Why
This revision was automatically updated to reflect the committed changes.
nickdesaulniers added a commit: rG05d74dbc3bb1: python bindings: fix DeprecationWarning.
Harbormaster completed remote builds in B67800: Diff 284515.Aug 10 2020, 4:01 PM
jdenny added a subscriber: jdenny.Aug 19 2020, 6:24 PM

Does this mean we officially no longer support python 2, which this change breaks?

nickdesaulniers added a comment.Aug 20 2020, 10:14 AM
In D85692#2227531, @jdenny wrote:

Does this mean we officially no longer support python 2, which this change breaks?

Send a patch to support both and I'll approve it.

jdenny added a comment.Aug 20 2020, 10:42 AM
In D85692#2228860, @nickdesaulniers wrote:
In D85692#2227531, @jdenny wrote:

Does this mean we officially no longer support python 2, which this change breaks?

Send a patch to support both and I'll approve it.

:-) I have no desire to support both. I'm asking whether I have to worry about python 2 when I do submit patches.

Revision Contents

PathSize
clang/
bindings/
python/
tests/
cindex/
6 lines

Diff 284517

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

Show All 35 Lines
# self.assertEqual(tu.diagnostics[1].spelling, 'instantiated from') # self.assertEqual(tu.diagnostics[1].spelling, 'instantiated from')
def test_diagnostic_fixit(self): def test_diagnostic_fixit(self):
tu = get_tu('struct { int f0; } x = { f0 : 1 };') tu = get_tu('struct { int f0; } x = { f0 : 1 };')
self.assertEqual(len(tu.diagnostics), 1) self.assertEqual(len(tu.diagnostics), 1)
self.assertEqual(tu.diagnostics[0].severity, Diagnostic.Warning) self.assertEqual(tu.diagnostics[0].severity, Diagnostic.Warning)
self.assertEqual(tu.diagnostics[0].location.line, 1) self.assertEqual(tu.diagnostics[0].location.line, 1)
self.assertEqual(tu.diagnostics[0].location.column, 26) 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.*') 'use of GNU old-style.*')
self.assertEqual(len(tu.diagnostics[0].fixits), 1) self.assertEqual(len(tu.diagnostics[0].fixits), 1)
self.assertEqual(tu.diagnostics[0].fixits[0].range.start.line, 1) self.assertEqual(tu.diagnostics[0].fixits[0].range.start.line, 1)
self.assertEqual(tu.diagnostics[0].fixits[0].range.start.column, 26) self.assertEqual(tu.diagnostics[0].fixits[0].range.start.column, 26)
self.assertEqual(tu.diagnostics[0].fixits[0].range.end.line, 1) self.assertEqual(tu.diagnostics[0].fixits[0].range.end.line, 1)
self.assertEqual(tu.diagnostics[0].fixits[0].range.end.column, 30) self.assertEqual(tu.diagnostics[0].fixits[0].range.end.column, 30)
self.assertEqual(tu.diagnostics[0].fixits[0].value, '.f0 = ') self.assertEqual(tu.diagnostics[0].fixits[0].value, '.f0 = ')
def test_diagnostic_range(self): def test_diagnostic_range(self):
tu = get_tu('void f() { int i = "a"; }') tu = get_tu('void f() { int i = "a"; }')
self.assertEqual(len(tu.diagnostics), 1) self.assertEqual(len(tu.diagnostics), 1)
self.assertEqual(tu.diagnostics[0].severity, Diagnostic.Warning) self.assertEqual(tu.diagnostics[0].severity, Diagnostic.Warning)
self.assertEqual(tu.diagnostics[0].location.line, 1) self.assertEqual(tu.diagnostics[0].location.line, 1)
self.assertEqual(tu.diagnostics[0].location.column, 16) self.assertEqual(tu.diagnostics[0].location.column, 16)
self.assertRegexpMatches(tu.diagnostics[0].spelling, self.assertRegex(tu.diagnostics[0].spelling,
'incompatible pointer to.*') 'incompatible pointer to.*')
self.assertEqual(len(tu.diagnostics[0].fixits), 0) self.assertEqual(len(tu.diagnostics[0].fixits), 0)
self.assertEqual(len(tu.diagnostics[0].ranges), 1) self.assertEqual(len(tu.diagnostics[0].ranges), 1)
self.assertEqual(tu.diagnostics[0].ranges[0].start.line, 1) self.assertEqual(tu.diagnostics[0].ranges[0].start.line, 1)
self.assertEqual(tu.diagnostics[0].ranges[0].start.column, 20) self.assertEqual(tu.diagnostics[0].ranges[0].start.column, 20)
self.assertEqual(tu.diagnostics[0].ranges[0].end.line, 1) self.assertEqual(tu.diagnostics[0].ranges[0].end.line, 1)
self.assertEqual(tu.diagnostics[0].ranges[0].end.column, 23) self.assertEqual(tu.diagnostics[0].ranges[0].end.column, 23)
with self.assertRaises(IndexError): with self.assertRaises(IndexError):
Show All 24 Lines# self.assertEqual(tu.diagnostics[1].spelling, 'instantiated from')
def test_diagnostic_children(self): def test_diagnostic_children(self):
tu = get_tu('void f(int x) {} void g() { f(); }') tu = get_tu('void f(int x) {} void g() { f(); }')
self.assertEqual(len(tu.diagnostics), 1) self.assertEqual(len(tu.diagnostics), 1)
d = tu.diagnostics[0] d = tu.diagnostics[0]
children = d.children children = d.children
self.assertEqual(len(children), 1) self.assertEqual(len(children), 1)
self.assertEqual(children[0].severity, Diagnostic.Note) self.assertEqual(children[0].severity, Diagnostic.Note)
self.assertRegexpMatches(children[0].spelling, self.assertRegex(children[0].spelling,
'.*declared here') '.*declared here')
self.assertEqual(children[0].location.line, 1) self.assertEqual(children[0].location.line, 1)
self.assertEqual(children[0].location.column, 6) self.assertEqual(children[0].location.column, 6)
def test_diagnostic_string_repr(self): def test_diagnostic_string_repr(self):
tu = get_tu('struct MissingSemicolon{}') tu = get_tu('struct MissingSemicolon{}')
self.assertEqual(len(tu.diagnostics), 1) self.assertEqual(len(tu.diagnostics), 1)
d = tu.diagnostics[0] d = tu.diagnostics[0]
self.assertEqual(repr(d), '<Diagnostic severity 3, location <SourceLocation file \'t.c\', line 1, column 26>, spelling "expected \';\' after struct">') self.assertEqual(repr(d), '<Diagnostic severity 3, location <SourceLocation file \'t.c\', line 1, column 26>, spelling "expected \';\' after struct">')