Index: docs/tools/dump_format_style.py =================================================================== --- docs/tools/dump_format_style.py +++ docs/tools/dump_format_style.py @@ -180,9 +180,9 @@ 'std::vector', 'std::vector', 'std::vector']: - if enums.has_key(option.type): + if option.type in enums: 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] else: raise Exception('Unknown type: %s' % option.type) Index: tools/scan-view/share/startfile.py =================================================================== --- tools/scan-view/share/startfile.py +++ tools/scan-view/share/startfile.py @@ -189,7 +189,7 @@ return _controllers[controller_name].open except KeyError: - if _controllers.has_key('xdg-open'): + if 'xdg-open' in _controllers: return _controllers['xdg-open'].open else: return webbrowser.open