This is an archive of the discontinued LLVM Phabricator instance.

Differential D55310

[utils] Use operator "in" instead of bound function "has_key"
ClosedPublic

Authored by rogfer01 on Dec 4 2018, 10:45 PM.

Details

Reviewers
gbedwell
MaskRay
Commits
rG52a50395cd73: [utils] Use operator "in" instead of bound function "has_key"
rL348576: [utils] Use operator "in" instead of bound function "has_key"
Summary

has_key has been removed in Python 3. The in comparison operator can be used instead.

Diff Detail

Event Timeline

rogfer01 created this revision.Dec 4 2018, 10:45 PM
Herald added a subscriber: llvm-commits. · View Herald TranscriptDec 4 2018, 10:45 PM
rogfer01 added a subscriber: smateo.Dec 5 2018, 12:07 AM
RKSimon edited reviewers, added: gbedwell, MaskRay; removed: RKSimon.Dec 5 2018, 2:02 AM
gbedwell accepted this revision.Dec 5 2018, 9:27 AM

LGTM.

This revision is now accepted and ready to land.Dec 5 2018, 9:27 AM
MaskRay accepted this revision.Dec 5 2018, 9:45 AM
rogfer01 added a comment.Dec 7 2018, 1:00 AM

Thanks for the review @gbedwell @MaskRay

I will commit it shortly.

Closed by commit rL348576: [utils] Use operator "in" instead of bound function "has_key" (authored by rogfer01). · Explain WhyDec 7 2018, 1:52 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
utils/
UpdateTestChecks/
2 lines

Diff 176764

utils/UpdateTestChecks/common.py

Show First 20 Lines • Show All 98 Lines • ▼ Show 20 Lines
def build_function_body_dictionary(function_re, scrubber, scrubber_args, raw_tool_output, prefixes, func_dict, verbose): def build_function_body_dictionary(function_re, scrubber, scrubber_args, raw_tool_output, prefixes, func_dict, verbose):
for m in function_re.finditer(raw_tool_output): for m in function_re.finditer(raw_tool_output):
if not m: if not m:
continue continue
func = m.group('func') func = m.group('func')
body = m.group('body') body = m.group('body')
scrubbed_body = do_scrub(body, scrubber, scrubber_args, extra = False) scrubbed_body = do_scrub(body, scrubber, scrubber_args, extra = False)
scrubbed_extra = do_scrub(body, scrubber, scrubber_args, extra = True) scrubbed_extra = do_scrub(body, scrubber, scrubber_args, extra = True)
if m.groupdict().has_key('analysis'): if 'analysis' in m.groupdict():
analysis = m.group('analysis') analysis = m.group('analysis')
if analysis.lower() != 'cost model analysis': if analysis.lower() != 'cost model analysis':
print('WARNING: Unsupported analysis mode: %r!' % (analysis,), file=sys.stderr) print('WARNING: Unsupported analysis mode: %r!' % (analysis,), file=sys.stderr)
if func.startswith('stress'): if func.startswith('stress'):
# We only use the last line of the function body for stress tests. # We only use the last line of the function body for stress tests.
scrubbed_body = '\n'.join(scrubbed_body.splitlines()[-1:]) scrubbed_body = '\n'.join(scrubbed_body.splitlines()[-1:])
if verbose: if verbose:
print('Processing function: ' + func, file=sys.stderr) print('Processing function: ' + func, file=sys.stderr)
▲ Show 20 Lines • Show All 151 Lines • Show Last 20 Lines