From: "Bob Feng" <bob.c.feng@intel.com>
To: "Liang, MingyueX" <mingyuex.liang@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: Liming Gao <gaoliming@byosoft.com.cn>,
"Chen, Christine" <yuwei.chen@intel.com>
Subject: Re: [PATCH 1/1] BaseTools: replace fromstring and tostring Method.
Date: Tue, 22 Dec 2020 02:06:05 +0000 [thread overview]
Message-ID: <DM6PR11MB4073A8BF816A758D0C7F0DCAC9DF0@DM6PR11MB4073.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20201113060406.379-1-mingyuex.liang@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
-----Original Message-----
From: Mingyue Liang <mingyuex.liang@intel.com>
Sent: Friday, November 13, 2020 2:04 PM
To: devel@edk2.groups.io
Cc: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>
Subject: [PATCH 1/1] BaseTools: replace fromstring and tostring Method.
Because after Python 3.2, array.tostring and array.fromstring method is renamed tobytes and frombytes,so it needs to be modified to support python2 and python3 methods.
Signed-off-by: Mingyue Liang <mingyuex.liang@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Cc: Mingyue Liang <mingyuex.liang@intel.com>
---
BaseTools/Source/Python/Eot/EotMain.py | 10 +++++-----
BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/BaseTools/Source/Python/Eot/EotMain.py b/BaseTools/Source/Python/Eot/EotMain.py
index 791fcdfeaed8..68cc9f1239f5 100644
--- a/BaseTools/Source/Python/Eot/EotMain.py
+++ b/BaseTools/Source/Python/Eot/EotMain.py
@@ -152,11 +152,11 @@ class CompressedImage(Image):
try:
TmpData = DeCompress('Efi', self[self._HEADER_SIZE_:])
DecData = array('B')
- DecData.fromstring(TmpData)
+ DecData.fromlist(array('B',TmpData).tolist())
except:
TmpData = DeCompress('Framework', self[self._HEADER_SIZE_:])
DecData = array('B')
- DecData.fromstring(TmpData)
+ DecData.fromlist(array('B',TmpData).tolist())
SectionList = []
Offset = 0
@@ -196,7 +196,7 @@ class Ui(Image):
return len(self)
def _GetUiString(self):
- return codecs.utf_16_decode(self[0:-2].tostring())[0]
+ return codecs.utf_16_decode(b"".join(list(map(lambda
+ x:bytes([x]), self[0:-2].tolist()))))[0]
String = property(_GetUiString)
@@ -738,7 +738,7 @@ class GuidDefinedImage(Image):
Offset = self.DataOffset - 4
TmpData = DeCompress('Framework', self[self.Offset:])
DecData = array('B')
- DecData.fromstring(TmpData)
+ DecData.fromlist(array('B',TmpData).tolist())
Offset = 0
while Offset < len(DecData):
Sec = Section()
@@ -759,7 +759,7 @@ class GuidDefinedImage(Image):
TmpData = DeCompress('Lzma', self[self.Offset:])
DecData = array('B')
- DecData.fromstring(TmpData)
+ DecData.fromlist(array('B',TmpData).tolist())
Offset = 0
while Offset < len(DecData):
Sec = Section()
diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index dc1727c4666d..83fa48187996 100644
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -463,12 +463,12 @@ class GenFdsGlobalVariable:
GenFdsGlobalVariable.SecCmdList.append(' '.join(Cmd).strip())
else:
SectionData = array('B', [0, 0, 0, 0])
- SectionData.fromstring(Ui.encode("utf_16_le"))
+
+ SectionData.fromlist(array('B',Ui.encode('utf-16-le')).tolist())
SectionData.append(0)
SectionData.append(0)
Len = len(SectionData)
GenFdsGlobalVariable.SectionHeader.pack_into(SectionData, 0, Len & 0xff, (Len >> 8) & 0xff, (Len >> 16) & 0xff, 0x15)
- SaveFileOnChange(Output, SectionData.tostring())
+ SaveFileOnChange(Output, b"".join(list(map(lambda
+ x:bytes([x]), SectionData.tolist()))))
elif Ver:
Cmd += ("-n", Ver)
--
2.29.2.windows.2
next prev parent reply other threads:[~2020-12-22 2:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 6:04 [PATCH 1/1] BaseTools: replace fromstring and tostring Method Mingyue Liang
2020-12-22 2:06 ` Bob Feng [this message]
2021-01-07 12:07 ` [edk2-devel] " Laszlo Ersek
2021-01-08 9:06 ` 回复: " gaoliming
-- strict thread matches above, loose matches on Subject: below --
2020-11-09 5:48 Mingyue Liang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DM6PR11MB4073A8BF816A758D0C7F0DCAC9DF0@DM6PR11MB4073.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox