public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH] BaseTools: replace array.fromstring Method for supports py-2 and py-3.
@ 2020-10-23  3:01 mliang2x
  2020-10-26  5:40 ` 回复: [edk2-devel] " fengyunhua
  2020-10-26  6:17 ` fengyunhua
  0 siblings, 2 replies; 3+ messages in thread
From: mliang2x @ 2020-10-23  3:01 UTC (permalink / raw)
  To: devel; +Cc: Mingyue Liang, Bob Feng, Liming Gao, Yuwei Chen

Because after Python 3.2, array.fromstring method is renamed 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>
---
 BaseTools/Source/Python/Eot/EotMain.py                 | 8 ++++----
 BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/BaseTools/Source/Python/Eot/EotMain.py b/BaseTools/Source/Python/Eot/EotMain.py
index 791fcdfeae..2ff68054e6 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)
+            list(map(lambda str: DecData.fromlist([ord(str), 0]), TmpData))
         except:
             TmpData = DeCompress('Framework', self[self._HEADER_SIZE_:])
             DecData = array('B')
-            DecData.fromstring(TmpData)
+            list(map(lambda str: DecData.fromlist([ord(str), 0]), TmpData))
 
         SectionList = []
         Offset = 0
@@ -738,7 +738,7 @@ class GuidDefinedImage(Image):
                 Offset = self.DataOffset - 4
                 TmpData = DeCompress('Framework', self[self.Offset:])
                 DecData = array('B')
-                DecData.fromstring(TmpData)
+                list(map(lambda str: DecData.fromlist([ord(str), 0]), TmpData))
                 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)
+                list(map(lambda str: DecData.fromlist([ord(str), 0]), TmpData))
                 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 dc1727c466..411af80c2b 100644
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -463,7 +463,7 @@ class GenFdsGlobalVariable:
                     GenFdsGlobalVariable.SecCmdList.append(' '.join(Cmd).strip())
             else:
                 SectionData = array('B', [0, 0, 0, 0])
-                SectionData.fromstring(Ui.encode("utf_16_le"))
+                list(map(lambda str: SectionData.fromlist([ord(str), 0]), Ui))
                 SectionData.append(0)
                 SectionData.append(0)
                 Len = len(SectionData)
-- 
2.28.0.windows.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-26  6:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-23  3:01 [PATCH] BaseTools: replace array.fromstring Method for supports py-2 and py-3 mliang2x
2020-10-26  5:40 ` 回复: [edk2-devel] " fengyunhua
2020-10-26  6:17 ` fengyunhua

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox