sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: array.fromstring and array.tostring removed in python 3.9

Browse Source 
array.fromstring and array.tostring deprecated, and alias for
array.frombytes and array.tobytes. Deprecated since version 3.2,
have been removed in version python 3.9.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Yunhua Feng <fengyunhua@byosoft.com.cn>
This commit is contained in:
Matt DeVillier
2021-02-25 16:28:26 -06:00
committed by Tim Crawford
parent 3e7febc83c
commit 553bda4d8e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
BaseTools/Source/Python/Eot/EotMain.py
View File

@ -152,11 +152,11 @@ class CompressedImage(Image):
try: try:
TmpData = DeCompress('Efi', self[self._HEADER_SIZE_:]) TmpData = DeCompress('Efi', self[self._HEADER_SIZE_:])
DecData = array('B') DecData = array('B')
DecData.fromstring(TmpData) DecData.frombytes(TmpData)
except: except:
TmpData = DeCompress('Framework', self[self._HEADER_SIZE_:]) TmpData = DeCompress('Framework', self[self._HEADER_SIZE_:])
DecData = array('B') DecData = array('B')
DecData.fromstring(TmpData) DecData.frombytes(TmpData)
SectionList = [] SectionList = []
Offset = 0 Offset = 0
@ -196,7 +196,7 @@ class Ui(Image):
return len(self) return len(self)
def _GetUiString(self): def _GetUiString(self):
return codecs.utf_16_decode(self[0:-2].tostring())[0] return codecs.utf_16_decode(self[0:-2].tobytes())[0]
String = property(_GetUiString) String = property(_GetUiString)
@ -738,7 +738,7 @@ class GuidDefinedImage(Image):
Offset = self.DataOffset - 4 Offset = self.DataOffset - 4
TmpData = DeCompress('Framework', self[self.Offset:]) TmpData = DeCompress('Framework', self[self.Offset:])
DecData = array('B') DecData = array('B')
DecData.fromstring(TmpData) DecData.frombytes(TmpData)
Offset = 0 Offset = 0
while Offset < len(DecData): while Offset < len(DecData):
Sec = Section() Sec = Section()
@ -759,7 +759,7 @@ class GuidDefinedImage(Image):
TmpData = DeCompress('Lzma', self[self.Offset:]) TmpData = DeCompress('Lzma', self[self.Offset:])
DecData = array('B') DecData = array('B')
DecData.fromstring(TmpData) DecData.frombytes(TmpData)
Offset = 0 Offset = 0
while Offset < len(DecData): while Offset < len(DecData):
Sec = Section() Sec = Section()