diff options
| author | Mathieu Bridon <[email protected]> | 2018-07-05 15:17:35 +0200 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-07-24 11:07:04 -0700 |
| commit | 1d209275c29886bac218d77135f61ae52464a1be (patch) | |
| tree | 4c6799c2e035b47743303eed6b4e8b75e737b18a /src/mapi/mapi_abi.py | |
| parent | 9b3474249513267bb4e50d450c70e688bffbc082 (diff) | |
python: Better check for keys in dicts
Python 3 lost the dict.has_key() method. Instead it requires using the
"in" operator.
This is also compatible with Python 2.
Signed-off-by: Mathieu Bridon <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mapi/mapi_abi.py')
| -rw-r--r-- | src/mapi/mapi_abi.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mapi/mapi_abi.py b/src/mapi/mapi_abi.py index 0a49c06ff2c..826721479d5 100644 --- a/src/mapi/mapi_abi.py +++ b/src/mapi/mapi_abi.py @@ -168,7 +168,7 @@ def abi_parse_xml(xml): else: attrs['handcode'] = None - if entry_dict.has_key(name): + if name in entry_dict: raise Exception('%s is duplicated' % (name)) cols = [] @@ -180,8 +180,7 @@ def abi_parse_xml(xml): ent = ABIEntry(cols, attrs, func) entry_dict[ent.name] = ent - entries = entry_dict.values() - entries.sort() + entries = sorted(entry_dict.values()) return entries @@ -246,12 +245,11 @@ def abi_parse(filename): raise Exception('invalid slot in %s' % (line)) ent = ABIEntry(cols, attrs) - if entry_dict.has_key(ent.name): + if ent.name in entry_dict: raise Exception('%s is duplicated' % (ent.name)) entry_dict[ent.name] = ent - entries = entry_dict.values() - entries.sort() + entries = sorted(entry_dict.values()) return entries |