From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=jaben.carsey@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 5CE62208EB401 for ; Tue, 19 Feb 2019 07:49:13 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Feb 2019 07:49:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,388,1544515200"; d="scan'208";a="116116059" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga007.jf.intel.com with ESMTP; 19 Feb 2019 07:49:12 -0800 Received: from fmsmsx117.amr.corp.intel.com (10.18.116.17) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 19 Feb 2019 07:49:12 -0800 Received: from fmsmsx103.amr.corp.intel.com ([169.254.2.115]) by fmsmsx117.amr.corp.intel.com ([169.254.3.143]) with mapi id 14.03.0415.000; Tue, 19 Feb 2019 07:49:12 -0800 From: "Carsey, Jaben" To: "Feng, Bob C" , "edk2-devel@lists.01.org" CC: "Gao, Liming" Thread-Topic: [Patch V2] BaseTools: replace Sdict with OrderedDict in UPT Thread-Index: AQHUyGoLogOc01Zckk2J6W/2TtQxkaXnRHfg Date: Tue, 19 Feb 2019 15:49:11 +0000 Message-ID: References: <20190219154422.12476-1-bob.c.feng@intel.com> In-Reply-To: <20190219154422.12476-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiN2QxODRlNWQtY2I3Zi00MWI0LThhOTMtOGEyNDRlY2IwMTFlIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiTVJOVW5kaUNlNXpQVk1obGFcL29vMHdrWnZEV2xmaVZcL2dtOEsxSVFuTHFTOGdoTUNVY01MclhDcDVSbTBaT1J6In0= x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.1.200.107] MIME-Version: 1.0 Subject: Re: [Patch V2] BaseTools: replace Sdict with OrderedDict in UPT 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: Tue, 19 Feb 2019 15:49:13 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jaben Carsey > -----Original Message----- > From: Feng, Bob C > Sent: Tuesday, February 19, 2019 7:44 AM > To: edk2-devel@lists.01.org > Cc: Feng, Bob C ; Gao, Liming > ; Carsey, Jaben > Subject: [Patch V2] BaseTools: replace Sdict with OrderedDict in UPT > Importance: High >=20 > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1504 >=20 > V2: import OrderredDict as Sdict in Misc.py instead > updating all the py files. >=20 > Sdict class is removed on the commit > 174a9d3cc8f74f7a731ac5f16ce6864c8eb359ec > but there are still some py files import it. >=20 > This patch is to use collections.OrderedDict to replace Sdict. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Bob Feng > Cc: Liming Gao > Cc: Jaben Carsey > --- > BaseTools/Source/Python/UPT/Library/Misc.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/UPT/Library/Misc.py > b/BaseTools/Source/Python/UPT/Library/Misc.py > index e7ee27cc53..0967ea53d1 100644 > --- a/BaseTools/Source/Python/UPT/Library/Misc.py > +++ b/BaseTools/Source/Python/UPT/Library/Misc.py > @@ -1,9 +1,9 @@ > ## @file > # Common routines used by all tools > # > -# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
> +# Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.
> # > # This program and the accompanying materials are licensed and made > available > # under the terms and conditions of the BSD License which accompanies th= is > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php > @@ -30,11 +30,11 @@ from os import remove > from os import rmdir > from os import linesep > from os import walk > from os import environ > import re > -from collections import OrderedDict > +from collections import OrderedDict as Sdict >=20 > import Logger.Log as Logger > from Logger import StringTable as ST > from Logger import ToolError > from Library import GlobalData > -- > 2.18.0.windows.1