Re: [edk2] [PATCH v1 1/1] BaseTools: Eot - fix variable names
Reviewed-by: Yonghong Zhu
Best Regards,
Zhu Yonghong
-Original Message-
From: Carsey, Jaben
Sent: Wednesday, August 08, 2018 6:37 AM
To: edk2-devel@lists.01.org
Cc: Zhu, Yonghong ; Gao, Liming
Subject: [PATCH v1 1/1] BaseTools: Eot - fix variable names
1) currently a couple classes use m instead of self (including some mixed
functions that should have previously failed).
2) deleted some blank lines.
Cc: Yonghong Zhu
Cc: Liming Gao
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey
---
BaseTools/Source/Python/Eot/Eot.py | 298 ++--
1 file changed, 144 insertions(+), 154 deletions(-)
diff --git a/BaseTools/Source/Python/Eot/Eot.py
b/BaseTools/Source/Python/Eot/Eot.py
index 6fb882642bff..ce83da14957b 100644
--- a/BaseTools/Source/Python/Eot/Eot.py
+++ b/BaseTools/Source/Python/Eot/Eot.py
@@ -123,49 +123,49 @@ class CompressedImage(Image):
_ORIG_SIZE_ = struct.Struct("1I")
_CMPRS_TYPE_= struct.Struct("4x 1B")
-def __init__(m, CompressedData=None, CompressionType=None,
UncompressedLength=None):
-Image.__init__(m)
+def __init__(self, CompressedData=None, CompressionType=None,
UncompressedLength=None):
+Image.__init__(self)
if UncompressedLength is not None:
-m.UncompressedLength = UncompressedLength
+self.UncompressedLength = UncompressedLength
if CompressionType is not None:
-m.CompressionType = CompressionType
+self.CompressionType = CompressionType
if CompressedData is not None:
-m.Data = CompressedData
+self.Data = CompressedData
-def __str__(m):
+def __str__(self):
global gIndention
-S = "algorithm=%s uncompressed=%x" % (m.CompressionType,
m.UncompressedLength)
-for Sec in m.Sections:
+S = "algorithm=%s uncompressed=%x" % (self.CompressionType,
self.UncompressedLength)
+for Sec in self.Sections:
S += '\n' + str(Sec)
return S
-def _SetOriginalSize(m, Size):
-m.SetField(m._ORIG_SIZE_, 0, Size)
+def _SetOriginalSize(self, Size):
+self.SetField(self._ORIG_SIZE_, 0, Size)
-def _GetOriginalSize(m):
-return m.GetField(m._ORIG_SIZE_)[0]
+def _GetOriginalSize(self):
+return self.GetField(self._ORIG_SIZE_)[0]
-def _SetCompressionType(m, Type):
-m.SetField(m._CMPRS_TYPE_, 0, Type)
+def _SetCompressionType(self, Type):
+self.SetField(self._CMPRS_TYPE_, 0, Type)
-def _GetCompressionType(m):
-return m.GetField(m._CMPRS_TYPE_)[0]
+def _GetCompressionType(self):
+return self.GetField(self._CMPRS_TYPE_)[0]
-def _GetSections(m):
+def _GetSections(self):
try:
from . import EfiCompressor
TmpData = EfiCompressor.FrameworkDecompress(
-m[m._HEADER_SIZE_:],
-len(m) - m._HEADER_SIZE_
+self[self._HEADER_SIZE_:],
+len(self) - self._HEADER_SIZE_
)
DecData = array('B')
DecData.fromstring(TmpData)
except:
from . import EfiCompressor
TmpData = EfiCompressor.UefiDecompress(
-m[m._HEADER_SIZE_:],
-len(m) - m._HEADER_SIZE_
+self[self._HEADER_SIZE_:],
+len(self) - self._HEADER_SIZE_
)
DecData = array('B')
DecData.fromstring(TmpData) @@ -195,20 +195,20 @@ class Ui(Image):
_HEADER_ = struct.Struct("")
_HEADER_SIZE_ = 0
-def __init__(m):
-Image.__init__(m)
+def __init__(self):
+Image.__init__(self)
-def __str__(m):
-return m.String
+def __str__(self):
+return self.String
-def _Unpack(m):
+def _Unpack(self):
# keep header in this Image object
-m.empty()
-m.extend(m._BUF_[m._OFF_ : m._OFF_ + m._LEN_])
-return len(m)
+self.empty()
+self.extend(self._BUF_[self._OFF_ : self._OFF_ + self._LEN_])
+return len(self)
-def _GetUiString(m):
-return codecs.utf_16_decode(m[0:-2].tostring())[0]
+def _GetUiString(self):
+return codecs.utf_16_decode(self[0:-2].tostring())[0]
String = property(_GetUiString)
@@ -250,18 +250,18 @@ class Depex(Image):
0x09: _OPCODE_, #"SOR"
}
-def __init__(m):
-Image.__init__(m)
-m._ExprList = []
+def __init__(self):
+Image.__init__(self)
+self._ExprList = []
-def __str__(m):
+def __str__(self):
global gIndention
gIndention += 4
Indention = ' ' *
[edk2] [PATCH v1 1/1] BaseTools: Eot - fix variable names
1) currently a couple classes use m instead of self (including some mixed
functions that should have previously failed).
2) deleted some blank lines.
Cc: Yonghong Zhu
Cc: Liming Gao
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey
---
BaseTools/Source/Python/Eot/Eot.py | 298 ++--
1 file changed, 144 insertions(+), 154 deletions(-)
diff --git a/BaseTools/Source/Python/Eot/Eot.py
b/BaseTools/Source/Python/Eot/Eot.py
index 6fb882642bff..ce83da14957b 100644
--- a/BaseTools/Source/Python/Eot/Eot.py
+++ b/BaseTools/Source/Python/Eot/Eot.py
@@ -123,49 +123,49 @@ class CompressedImage(Image):
_ORIG_SIZE_ = struct.Struct("1I")
_CMPRS_TYPE_= struct.Struct("4x 1B")
-def __init__(m, CompressedData=None, CompressionType=None,
UncompressedLength=None):
-Image.__init__(m)
+def __init__(self, CompressedData=None, CompressionType=None,
UncompressedLength=None):
+Image.__init__(self)
if UncompressedLength is not None:
-m.UncompressedLength = UncompressedLength
+self.UncompressedLength = UncompressedLength
if CompressionType is not None:
-m.CompressionType = CompressionType
+self.CompressionType = CompressionType
if CompressedData is not None:
-m.Data = CompressedData
+self.Data = CompressedData
-def __str__(m):
+def __str__(self):
global gIndention
-S = "algorithm=%s uncompressed=%x" % (m.CompressionType,
m.UncompressedLength)
-for Sec in m.Sections:
+S = "algorithm=%s uncompressed=%x" % (self.CompressionType,
self.UncompressedLength)
+for Sec in self.Sections:
S += '\n' + str(Sec)
return S
-def _SetOriginalSize(m, Size):
-m.SetField(m._ORIG_SIZE_, 0, Size)
+def _SetOriginalSize(self, Size):
+self.SetField(self._ORIG_SIZE_, 0, Size)
-def _GetOriginalSize(m):
-return m.GetField(m._ORIG_SIZE_)[0]
+def _GetOriginalSize(self):
+return self.GetField(self._ORIG_SIZE_)[0]
-def _SetCompressionType(m, Type):
-m.SetField(m._CMPRS_TYPE_, 0, Type)
+def _SetCompressionType(self, Type):
+self.SetField(self._CMPRS_TYPE_, 0, Type)
-def _GetCompressionType(m):
-return m.GetField(m._CMPRS_TYPE_)[0]
+def _GetCompressionType(self):
+return self.GetField(self._CMPRS_TYPE_)[0]
-def _GetSections(m):
+def _GetSections(self):
try:
from . import EfiCompressor
TmpData = EfiCompressor.FrameworkDecompress(
-m[m._HEADER_SIZE_:],
-len(m) - m._HEADER_SIZE_
+self[self._HEADER_SIZE_:],
+len(self) - self._HEADER_SIZE_
)
DecData = array('B')
DecData.fromstring(TmpData)
except:
from . import EfiCompressor
TmpData = EfiCompressor.UefiDecompress(
-m[m._HEADER_SIZE_:],
-len(m) - m._HEADER_SIZE_
+self[self._HEADER_SIZE_:],
+len(self) - self._HEADER_SIZE_
)
DecData = array('B')
DecData.fromstring(TmpData)
@@ -195,20 +195,20 @@ class Ui(Image):
_HEADER_ = struct.Struct("")
_HEADER_SIZE_ = 0
-def __init__(m):
-Image.__init__(m)
+def __init__(self):
+Image.__init__(self)
-def __str__(m):
-return m.String
+def __str__(self):
+return self.String
-def _Unpack(m):
+def _Unpack(self):
# keep header in this Image object
-m.empty()
-m.extend(m._BUF_[m._OFF_ : m._OFF_ + m._LEN_])
-return len(m)
+self.empty()
+self.extend(self._BUF_[self._OFF_ : self._OFF_ + self._LEN_])
+return len(self)
-def _GetUiString(m):
-return codecs.utf_16_decode(m[0:-2].tostring())[0]
+def _GetUiString(self):
+return codecs.utf_16_decode(self[0:-2].tostring())[0]
String = property(_GetUiString)
@@ -250,18 +250,18 @@ class Depex(Image):
0x09: _OPCODE_, #"SOR"
}
-def __init__(m):
-Image.__init__(m)
-m._ExprList = []
+def __init__(self):
+Image.__init__(self)
+self._ExprList = []
-def __str__(m):
+def __str__(self):
global gIndention
gIndention += 4
Indention = ' ' * gIndention
S = '\n'
-for T in m.Expression:
-if T in m._OPCODE_STRING_:
-S += Indention + m._OPCODE_STRING_[T]
+for T in self.Expression:
+if T in self._OPCODE_STRING_:
+S += Indention +
