This is an archive of the discontinued LLVM Phabricator instance.

Differential D55194

Python2/3 compatiility - has_key
ClosedPublic

Authored by serge-sans-paille on Dec 3 2018, 2:37 AM.

Details

Reviewers
joerg
michaelplatings
Summary

has_key versus in

Diff Detail

Event Timeline

serge-sans-paille created this revision.Dec 3 2018, 2:37 AM
serge-sans-paille retitled this revision from Python2/3 compatiility to Python2/3 compatiility - has_key.Dec 3 2018, 2:51 AM
joerg added a comment.Dec 3 2018, 4:04 AM

LGTM

docs/tools/dump_format_style.py
183

Can you separately adjust the for-loop just above to use a set() and not a list of strings?

serge-sans-paille marked 2 inline comments as done.Dec 10 2018, 1:06 AM
serge-sans-paille added inline comments.
docs/tools/dump_format_style.py
183

I agree with the change, but it's unrelated to the portability issue. Better not mix everything :-)

michaelplatings accepted this revision.Dec 13 2018, 2:13 AM

LGTM

This revision is now accepted and ready to land.Dec 13 2018, 2:13 AM
serge-sans-paille closed this revision.Dec 18 2018, 12:30 AM
serge-sans-paille marked an inline comment as done.

Commited as https://llvm.org/svn/llvm-project/cfe/trunk@349447

Revision Contents

PathSize
docs/
tools/
4 lines
tools/
scan-view/
share/
2 lines

Diff 176334

docs/tools/dump_format_style.py

Context not available.
'std::vector<std::string>', 'std::vector<std::string>',
'std::vector<IncludeCategory>', 'std::vector<IncludeCategory>',
'std::vector<RawStringFormat>']: 'std::vector<RawStringFormat>']:
if enums.has_key(option.type): if option.type in enums:
joergUnsubmitted
Done
ReplyInline Actions

Can you separately adjust the for-loop just above to use a set() and not a list of strings?

joerg: Can you separately adjust the for-loop just above to use a set() and not a list of strings?
serge-sans-pailleAuthorUnsubmitted
Done
ReplyInline Actions

I agree with the change, but it's unrelated to the portability issue. Better not mix everything :-)

serge-sans-paille: I agree with the change, but it's unrelated to the portability issue. Better not mix everything…
option.enum = enums[option.type] option.enum = enums[option.type]
elif nested_structs.has_key(option.type): elif option.type in nested_structs:
option.nested_struct = nested_structs[option.type] option.nested_struct = nested_structs[option.type]
else: else:
raise Exception('Unknown type: %s' % option.type) raise Exception('Unknown type: %s' % option.type)
Context not available.

tools/scan-view/share/startfile.py

Context not available.
return _controllers[controller_name].open return _controllers[controller_name].open
except KeyError: except KeyError:
if _controllers.has_key('xdg-open'): if 'xdg-open' in _controllers:
return _controllers['xdg-open'].open return _controllers['xdg-open'].open
else: else:
return webbrowser.open return webbrowser.open
Context not available.