[Patch V2] BaseTools: replace Sdict with OrderedDict in UPT

[Patch V2] BaseTools: replace Sdict with OrderedDict in UPT

[Feng, Bob C]

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1504

V2: import OrderredDict as Sdict in Misc.py instead 
updating all the py files.

Sdict class is removed on the commit
174a9d3cc8f74f7a731ac5f16ce6864c8eb359ec
but there are still some py files import it.

This patch is to use collections.OrderedDict to replace Sdict.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
---
 BaseTools/Source/Python/UPT/Library/Misc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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.<BR>
+# Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.<BR>
 #
 # This program and the accompanying materials are licensed and made available
 # under the terms and conditions of the BSD License which accompanies this
 # 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
 
 import Logger.Log as Logger
 from Logger import StringTable as ST
 from Logger import ToolError
 from Library import GlobalData
-- 
2.18.0.windows.1

Re: [Patch V2] BaseTools: replace Sdict with OrderedDict in UPT

[Carsey, Jaben]

Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

> -----Original Message-----
> From: Feng, Bob C
> Sent: Tuesday, February 19, 2019 7:44 AM
> To: edk2-devel@lists.01.org
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming
> <liming.gao@intel.com>; Carsey, Jaben <jaben.carsey@intel.com>
> Subject: [Patch V2] BaseTools: replace Sdict with OrderedDict in UPT
> Importance: High
> 
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1504
> 
> V2: import OrderredDict as Sdict in Misc.py instead
> updating all the py files.
> 
> Sdict class is removed on the commit
> 174a9d3cc8f74f7a731ac5f16ce6864c8eb359ec
> but there are still some py files import it.
> 
> This patch is to use collections.OrderedDict to replace Sdict.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> ---
>  BaseTools/Source/Python/UPT/Library/Misc.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> 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.<BR>
> +# Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
>  # This program and the accompanying materials are licensed and made
> available
>  # under the terms and conditions of the BSD License which accompanies this
>  # 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
> 
>  import Logger.Log as Logger
>  from Logger import StringTable as ST
>  from Logger import ToolError
>  from Library import GlobalData
> --
> 2.18.0.windows.1