From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 16894211CF341 for ; Mon, 25 Feb 2019 05:23:59 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Feb 2019 05:23:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,411,1544515200"; d="scan'208";a="146341412" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga002.fm.intel.com with ESMTP; 25 Feb 2019 05:23:59 -0800 Received: from fmsmsx158.amr.corp.intel.com (10.18.116.75) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 25 Feb 2019 05:23:59 -0800 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by fmsmsx158.amr.corp.intel.com (10.18.116.75) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 25 Feb 2019 05:23:59 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.102]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.36]) with mapi id 14.03.0415.000; Mon, 25 Feb 2019 21:23:56 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [Patch 1/2] BaseTools: Eot failed when enable python3 Thread-Index: AQHUzOu38WxpF2w+Ykmb8e/9HAL5K6XwgNpQ Date: Mon, 25 Feb 2019 13:23:56 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3E741A@SHSMSX104.ccr.corp.intel.com> References: <20190225092226.15828-1-bob.c.feng@intel.com> In-Reply-To: <20190225092226.15828-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYzJlZjVjN2EtNzA2OC00MTdmLTlkMTQtZmZhYmRkZjEwOGFjIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiYkpsaHFQYUV5MHJWMmpsRkdZTjZjOWp6d1wvNXJxQ21CQVNpXC84bEkrZGxMSVZPVmxvbjF5OE9yK0kweisyclhuIn0= dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch 1/2] BaseTools: Eot failed when enable python3 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2019 13:24:00 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: Feng, Bob C > Sent: Monday, February 25, 2019 5:22 PM > To: edk2-devel@lists.01.org > Cc: Feng, Bob C ; Gao, Liming > Subject: [Patch 1/2] BaseTools: Eot failed when enable python3 >=20 > The Eot will report error when python3 enabled. > We replaced sdict with collections.OrderedDict in python3 > patch set, but the sdict implement "append" method which is not > implemented in collections.OrderedDict. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Bob Feng > Cc: Liming Gao > --- > BaseTools/Source/Python/Eot/EotMain.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/BaseTools/Source/Python/Eot/EotMain.py b/BaseTools/Source/Py= thon/Eot/EotMain.py > index 56aa48d2a1..3020f6525e 100644 > --- a/BaseTools/Source/Python/Eot/EotMain.py > +++ b/BaseTools/Source/Python/Eot/EotMain.py > @@ -1103,11 +1103,11 @@ class MultipleFv(FirmwareVolume): >=20 > Fv =3D FirmwareVolume(FvName) > Fv.frombuffer(Buf, 0, len(Buf)) >=20 > self.BasicInfo.append([Fv.Name, Fv.FileSystemGuid, Fv.Size]) > - self.FfsDict.append(Fv.FfsDict) > + self.FfsDict.update(Fv.FfsDict) >=20 > ## Class Eot > # > # This class is used to define Eot main entrance > # > -- > 2.20.1.windows.1