github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 22:18:17 +00:00
Code Issues Projects Releases Wiki Activity

board_inspector/lib: fix compatibility issues in unpack.py

Browse Source 
Starting from Python 3.0 the following changes to the language are
effective:

1. The integer types `int` and `long` have been unified as `int`. See
   `https://www.python.org/dev/peps/pep-0237/` for details.
2. The `.iterkeys` method is removed from the `dict` class. See
   `https://www.python.org/dev/peps/pep-3106/` for details.

This patch updates `unpack.py`, originally from BITS, so that it can be
used in Python 3.

Tracked-On: #5922
Signed-off-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Junjie Mao 2021-04-30 08:29:53 +08:00 committed by wenlingz
parent e6e61a4979
commit 05c738a480
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
misc/config_tools/board_inspector/lib/unpack.py
View File

@ -127,7 +127,7 @@ class Struct(object):
if hasattr(self, name): if hasattr(self, name):
raise StructError("Internal error: Duplicate Struct field name {}".format(name)) raise StructError("Internal error: Duplicate Struct field name {}".format(name))
if fmt is None: if fmt is None:
if isinstance(value, (int, long)) and not isinstance(value, bool): if isinstance(value, int) and not isinstance(value, bool):
fmt = "{:#x}".format fmt = "{:#x}".format
else: else:
fmt = "{!r}".format fmt = "{!r}".format
@ -142,21 +142,21 @@ class Struct(object):
return self.fields[name](getattr(self, name)) return self.fields[name](getattr(self, name))
def __repr__(self): def __repr__(self):
return "{}({})".format(self.__class__.__name__, ", ".join("{}={}".format(k, self.format_field(k)) for k in self.fields.iterkeys())) return "{}({})".format(self.__class__.__name__, ", ".join("{}={}".format(k, self.format_field(k)) for k in self.fields.keys()))
def __iter__(self): def __iter__(self):
return (getattr(self, k) for k in self.fields.iterkeys()) return (getattr(self, k) for k in self.fields.keys())
def __eq__(self, other): def __eq__(self, other):
if type(self) is not type(other): if type(self) is not type(other):
return NotImplemented return NotImplemented
return self.fields.keys() == other.fields.keys() and all(getattr(self, name) == getattr(other, name) for name in self.fields.iterkeys()) return self.fields.keys() == other.fields.keys() and all(getattr(self, name) == getattr(other, name) for name in self.fields.keys())
def __ne__(self, other): def __ne__(self, other):
return not self == other return not self == other
def __hash__(self): def __hash__(self):
return hash(tuple((name, getattr(self, name)) for name in self.fields.iterkeys())) return hash(tuple((name, getattr(self, name)) for name in self.fields.keys()))
def format_each(fmt_one): def format_each(fmt_one):
def f(it): def f(it):