From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web11.6164.1608602772633606672 for ; Mon, 21 Dec 2020 18:06:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=qa8Vfm85; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: bob.c.feng@intel.com) IronPort-SDR: D0C1nSwz9cmIZ8BdUdMj2GtOOpHHw5Ba4sY7U7O4v0kwtbTUDnUL1BD+5YdVb2AgzavyfObuo1 vheVWuuKIlRg== X-IronPort-AV: E=McAfee;i="6000,8403,9842"; a="175907995" X-IronPort-AV: E=Sophos;i="5.78,438,1599548400"; d="scan'208";a="175907995" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2020 18:06:08 -0800 IronPort-SDR: azAyrD91N4tBp4aEgRVKR9ygMnQluvvVNSADlmIE3kyP2kbs3HBoyFc4cA9HS2X3gR18UQHpT0 F29NMIP0ZzTA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,438,1599548400"; d="scan'208";a="491991753" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by orsmga004.jf.intel.com with ESMTP; 21 Dec 2020 18:06:08 -0800 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 21 Dec 2020 18:06:08 -0800 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX609.amr.corp.intel.com (10.22.229.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 21 Dec 2020 18:06:08 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Mon, 21 Dec 2020 18:06:08 -0800 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (104.47.38.53) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Mon, 21 Dec 2020 18:06:07 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gp+u8/hHE8Fkc8EG5aKcfApTtx4R3pE9hB+XqFbJhBBRz5wMZwCy8ZnTU+8HCL03NoQMp6VxYqhn745X+yGGbNEK7wXVJrlJ8ul2CWxDRf4qiB3ib6RFFi0FSgX1OLzbKMBZQPKOGLTH4tS6bvEeWXgjrCNqp/kmYfZq39NOC3f8upPgIlM7LWDZhBQd+g8KJdV0bYEk3zSpyTWQne6KU/Tyk7OFdQjW4xNpnMRWUxp4tjSyNFM067wgIku4BEPlsQzQA77CblYaEFxIlIo4gjntjRBg3b4j2I1SQuWzOghJ3Sy8+r0WI4LTChrzqH97rOKsQ7f9sdxzpMSjyZA0EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gwCjF6MkHl5q9kEPcRhk9pH0+p3SUKeozKtCXfluydg=; b=Gj+LDK4l3JO7jmFj77+e3gsbkv1wN/To/OQU/gDJtM95vBD7GwyPNTOmOs5G51jcyIZEXiTKz1GsHmSBbWT+dJFnDMKbC51CsmwaHB7sRNRrKUV7+wt7ebC27VtSmgmDmNgOyz49FVjgJQTHJsP9Pz1X4gqITH6QahDx4pk9CDk18kdyh+d2gUs6XluVB+bw328h8HBxY09wTD9gjg/1mhro2yceQg+l+pVROpiBsVHvegCvfTu2dlpBKJPFrVajt8GBsgoh9NmeZeb4QvBfT6WXz0R6/nS1HsSLelsn86xAu0IVH6VI+oOYGBrkH7VbdGOXxk9ym32IW7OjCkmj4w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gwCjF6MkHl5q9kEPcRhk9pH0+p3SUKeozKtCXfluydg=; b=qa8Vfm85YaTgCOqqB8PI2GbqT9HGc86KAAftlVjQ60rYDxM8I5YXvrad5cOm5wci9coNwbDd88TMRkVdzadTVpDgWqQdl8jnmmKzvbHkcEyysYgouGnQdwmw9ymLSTJJ0/VYPkUR7AjpHgYm7+JwbmXGYCXqUYqJwntHp8ClBdQ= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM5PR11MB1308.namprd11.prod.outlook.com (2603:10b6:3:e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.19; Tue, 22 Dec 2020 02:06:05 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::c9f:47ea:6321:5ccb]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::c9f:47ea:6321:5ccb%3]) with mapi id 15.20.3676.033; Tue, 22 Dec 2020 02:06:05 +0000 From: "Bob Feng" To: "Liang, MingyueX" , "devel@edk2.groups.io" CC: Liming Gao , "Chen, Christine" Subject: Re: [PATCH 1/1] BaseTools: replace fromstring and tostring Method. Thread-Topic: [PATCH 1/1] BaseTools: replace fromstring and tostring Method. Thread-Index: AQHWuYLV9H6C3aZx1UGBExXz+TpzhKoCmmVw Date: Tue, 22 Dec 2020 02:06:05 +0000 Message-ID: References: <20201113060406.379-1-mingyuex.liang@intel.com> In-Reply-To: <20201113060406.379-1-mingyuex.liang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.102.204.37] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: fa87b88f-04f0-462f-e13f-08d8a61e2402 x-ms-traffictypediagnostic: DM5PR11MB1308: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:826; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: LNHfLwqzup3RGFRPwpf4By4zrgXz6CqqY56ctjwoyrJnMOUMH6mEtvq97ktSsWcRdo/6qCZ3WkGvtByXsvTPA1SCvxhl4u8H2jRChrngJb3Q5oowrWIJjksO4sAivlNAre3Zf93bxof6uLIA7izBciD6HdXs2DPW4pFpRKaWh7CUPNcIqFQkBTffpN7fN0eXSiwrXVPGIOtUIc6lf9z3Cf/XXMduBsT0vagYosG3s+tcdp57NJ/sBS28r2LBI4UDmL6jGIgcCsAFxN7eNQLr1KmcY0t2gL5OSnsFdkTROXmOsRSTLWAFkTjVnoirTbpi x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4073.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(396003)(136003)(376002)(346002)(39860400002)(52536014)(8676002)(5660300002)(53546011)(66446008)(83380400001)(6506007)(110136005)(26005)(66946007)(8936002)(66556008)(7696005)(66476007)(76116006)(71200400001)(54906003)(33656002)(9686003)(478600001)(2906002)(186003)(64756008)(107886003)(4326008)(316002)(55016002)(86362001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?ERjKlQCuU7ze7wOM+uYuc7nqNU3sbvehvJs5ZoX8yu4rBDacyszZeQmhvJlJ?= =?us-ascii?Q?niGUW240J+wq6vGl1AJv9NZWs99Mna7n8CXZ1spPRlSOxmlO+vB8xxgwXfKT?= =?us-ascii?Q?DHxUUkzlNgd1F/GA7DeDBoHsDs4McITUufbSdQin6kAxyg9LCfyE7CBihigy?= =?us-ascii?Q?LVuVneu8jG7DwckTmq10nvJ8vJufsQrMEQO7XSx0VI/3/tHKM+oju35u7iVn?= =?us-ascii?Q?ewgbJySxEfmBE0YVrn3D6wGK9pxhJDn5eGRaR494JlXhPmQSZlbxRn2/A8mi?= =?us-ascii?Q?cgCR15dxceJtiFaHxGfKBUpCjBjs5jRiRTHgb29MvM6v9++cynCRpM5LA+V5?= =?us-ascii?Q?o55Wey6/LyV4bSSLwzQJQ9tvpKJD7Wle6MBG1Ek1qomnzJiuCalsBlwaRJF2?= =?us-ascii?Q?ixHPMK8evR44Tf43/ZT3k9NqPyeSqdCgan93PyPOMyblYMQeAMqNJb2Gfi5H?= =?us-ascii?Q?OR+7L+7qg7QLFaDOnV9Cyb6ijDtS8g2rs0ZSXceJc/SKd2tQKbfk8F4UXEkJ?= =?us-ascii?Q?rrvTFMnrQfclbOyXmIVSADRGYEcL2nPJnH6Z6BRt7EMkvC2cTrGvinH1F+nX?= =?us-ascii?Q?hrNYo6KWKoO+gZsxGQAurqWWUPs8wvCUZfO3dxJKUGTYOVY1XjdDfmXB+jtP?= =?us-ascii?Q?bAsKBall+8I4REoaKgi4U0CjQ7EQRa6hSlVK1DUO643w8fgs/LPRs1zbhn5j?= =?us-ascii?Q?LLEXSTEwBKk7dbHkxlKr4inIiPazhPdbNXENObCcHW7SCcrGjHynhMOMFS4H?= =?us-ascii?Q?+N+gQ2WXAZPtSPyWwoPvD+FWWntlSuAqVgQRzovvK1Md2cEH6dLWVvZG7Xix?= =?us-ascii?Q?/gZ3jI7cpaTF2/rqJcVDc+P8D6IvMUCadu1XxXyhop0mzO8wLJoLETM5UNoy?= =?us-ascii?Q?ffoLgzpEHBiqSRF6SDM7XdziCy+aqFDeZnLe+l+n/HXnbS4SUysxhjuZtnVS?= =?us-ascii?Q?fGlzVY7qOkI+P3OvUb7bLQb1myleb9s+QDagZVV+JNY=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4073.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa87b88f-04f0-462f-e13f-08d8a61e2402 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Dec 2020 02:06:05.5443 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 9ufn01SEnLisDOOwnhMXESw6cvRLfH5Yaef+TAzFOQ7MT2cu7dwVqwoAJw5Jl1WP/gvFh4/ZQuHYFo+x5MZPaA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR11MB1308 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bob Feng -----Original Message----- From: Mingyue Liang =20 Sent: Friday, November 13, 2020 2:04 PM To: devel@edk2.groups.io Cc: Feng, Bob C ; Liming Gao ; Chen, Christine Subject: [PATCH 1/1] BaseTools: replace fromstring and tostring Method. Because after Python 3.2, array.tostring and array.fromstring method is ren= amed tobytes and frombytes,so it needs to be modified to support python2 an= d python3 methods. Signed-off-by: Mingyue Liang Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Cc: Mingyue Liang --- 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/Pyth= on/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 =3D DeCompress('Efi', self[self._HEADER_SIZE_:]) DecData =3D array('B') - DecData.fromstring(TmpData) + DecData.fromlist(array('B',TmpData).tolist()) except: TmpData =3D DeCompress('Framework', self[self._HEADER_SIZE_:]) DecData =3D array('B') - DecData.fromstring(TmpData) + DecData.fromlist(array('B',TmpData).tolist()) =20 SectionList =3D [] Offset =3D 0 @@ -196,7 +196,7 @@ class Ui(Image): return len(self) =20 def _GetUiString(self): - return codecs.utf_16_decode(self[0:-2].tostring())[0] + return codecs.utf_16_decode(b"".join(list(map(lambda=20 + x:bytes([x]), self[0:-2].tolist()))))[0] =20 String =3D property(_GetUiString) =20 @@ -738,7 +738,7 @@ class GuidDefinedImage(Image): Offset =3D self.DataOffset - 4 TmpData =3D DeCompress('Framework', self[self.Offset:]) DecData =3D array('B') - DecData.fromstring(TmpData) + DecData.fromlist(array('B',TmpData).tolist()) Offset =3D 0 while Offset < len(DecData): Sec =3D Section() @@ -759,7 +759,7 @@ class GuidDefinedImage(Image): =20 TmpData =3D DeCompress('Lzma', self[self.Offset:]) DecData =3D array('B') - DecData.fromstring(TmpData) + DecData.fromlist(array('B',TmpData).tolist()) Offset =3D 0 while Offset < len(DecData): Sec =3D Section() diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseT= ools/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).s= trip()) else: SectionData =3D array('B', [0, 0, 0, 0]) - SectionData.fromstring(Ui.encode("utf_16_le")) + =20 + SectionData.fromlist(array('B',Ui.encode('utf-16-le')).tolist()) SectionData.append(0) SectionData.append(0) Len =3D 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=20 + x:bytes([x]), SectionData.tolist())))) =20 elif Ver: Cmd +=3D ("-n", Ver) -- 2.29.2.windows.2