[Patch] BaseTools: replace Sdict with OrderedDict in UPT

["Feng, Bob C" <bob.c.feng@intel.com>]

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1504
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>
---
 BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py  | 4 ++--
 BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py         | 4 ++--
 BaseTools/Source/Python/UPT/InstallPkg.py                     | 4 ++--
 BaseTools/Source/Python/UPT/Object/POM/PackageObject.py       | 4 ++--
 BaseTools/Source/Python/UPT/Object/Parser/DecObject.py        | 4 ++--
 BaseTools/Source/Python/UPT/Object/Parser/InfBinaryObject.py  | 4 ++--
 BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py  | 4 ++--
 BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py    | 4 ++--
 .../Python/UPT/Object/Parser/InfLibraryClassesObject.py       | 4 ++--
 BaseTools/Source/Python/UPT/Object/Parser/InfMisc.py          | 4 ++--
 .../Source/Python/UPT/Object/Parser/InfPackagesObject.py      | 4 ++--
 BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py     | 4 ++--
 BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py     | 4 ++--
 .../Source/Python/UPT/Object/Parser/InfProtocolObject.py      | 4 ++--
 BaseTools/Source/Python/UPT/Object/Parser/InfSoucesObject.py  | 4 ++--
 .../Source/Python/UPT/Object/Parser/InfUserExtensionObject.py | 4 ++--
 BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py     | 4 ++--
 BaseTools/Source/Python/UPT/Xml/XmlParser.py                  | 4 ++--
 18 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py b/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
index 873e2b4de4..13f5cd951b 100644
--- a/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
+++ b/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
@@ -1,9 +1,9 @@
 ## @file
 # This file is used to define a class object to describe a distribution package
 #
-# 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
@@ -18,11 +18,11 @@ DistributionPackageClass
 ##
 # Import Modules
 #
 import os.path
 
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 from Library.Misc import GetNonMetaDataFiles
 from PomAdapter.InfPomAlignment import InfPomAlignment
 from PomAdapter.DecPomAlignment import DecPomAlignment
 import Logger.Log as Logger
 from Logger import StringTable as ST
diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
index 40346b0b3a..1ef2714c5e 100644
--- a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
+++ b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
@@ -1,10 +1,10 @@
 ## @file GenInfFile.py
 #
 # This file contained the logical of transfer package object to INF files.
 #
-# 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
@@ -24,11 +24,11 @@ from Library.StringUtils import GetSplitValueList
 from Library.Parsing import GenSection
 from Library.Parsing import GetWorkspacePackage
 from Library.Parsing import ConvertArchForInstall
 from Library.Misc import SaveFileOnChange
 from Library.Misc import IsAllModuleList
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 from Library.Misc import ConvertPath
 from Library.Misc import ConvertSpec
 from Library.Misc import GetRelativePath
 from Library.Misc import GetLocalValue
 from Library.CommentGenerating import GenHeaderCommentSection
diff --git a/BaseTools/Source/Python/UPT/InstallPkg.py b/BaseTools/Source/Python/UPT/InstallPkg.py
index cbc54f9407..91c7f040b1 100644
--- a/BaseTools/Source/Python/UPT/InstallPkg.py
+++ b/BaseTools/Source/Python/UPT/InstallPkg.py
@@ -1,9 +1,9 @@
 ## @file
 # Install distribution package.
 #
-# 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
@@ -42,11 +42,11 @@ from Logger.ToolError import ABORT_ERROR
 from Logger.ToolError import CODE_ERROR
 from Logger.ToolError import FORMAT_INVALID
 from Logger.ToolError import FILE_TYPE_MISMATCH
 import Logger.Log as Logger
 
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 from Library.Misc import ConvertPath
 from Library.ParserValidate import IsValidInstallPath
 from Xml.XmlParser import DistributionPackageXml
 from GenMetaFile.GenDecFile import PackageToDec
 from GenMetaFile.GenInfFile import ModuleToInf
diff --git a/BaseTools/Source/Python/UPT/Object/POM/PackageObject.py b/BaseTools/Source/Python/UPT/Object/POM/PackageObject.py
index 46de837a44..eec40e1886 100644
--- a/BaseTools/Source/Python/UPT/Object/POM/PackageObject.py
+++ b/BaseTools/Source/Python/UPT/Object/POM/PackageObject.py
@@ -1,9 +1,9 @@
 ## @file
 # This file is used to define a class object to describe a package
 #
-# 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
@@ -20,11 +20,11 @@ PackageObject
 #
 from Object.POM.CommonObject import CommonPropertiesObject
 from Object.POM.CommonObject import IdentificationObject
 from Object.POM.CommonObject import CommonHeaderObject
 from Object.POM.CommonObject import BinaryHeaderObject
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 
 ## StandardIncludeFileObject
 #
 class StandardIncludeFileObject(CommonPropertiesObject):
     def __init__(self):
diff --git a/BaseTools/Source/Python/UPT/Object/Parser/DecObject.py b/BaseTools/Source/Python/UPT/Object/Parser/DecObject.py
index fab4be351f..3eec5db8f3 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/DecObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/DecObject.py
@@ -1,10 +1,10 @@
 ## @file
 # This file is used to define class objects for DEC file. It will consumed by
 #DecParser
 #
-# 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
@@ -18,11 +18,11 @@ DecObject
 
 ## Import modules
 #
 import os.path
 
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 from Library.DataType import TAB_GUIDS
 from Library.DataType import TAB_PPIS
 from Library.DataType import TAB_PROTOCOLS
 from Library.DataType import TAB_DEC_DEFINES
 from Library.DataType import TAB_INCLUDES
diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfBinaryObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfBinaryObject.py
index af5af46ab2..7e9a4ccb7f 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfBinaryObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfBinaryObject.py
@@ -1,10 +1,10 @@
 ## @file
 # This file is used to define class objects of INF file [Binaries] section.
 # It will consumed by InfParser.
 #
-# 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
@@ -22,11 +22,11 @@ from copy import deepcopy
 from Library import DataType as DT
 from Library import GlobalData
 import Logger.Log as Logger
 from Logger import ToolError
 from Logger import StringTable as ST
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 
 from Object.Parser.InfCommonObject import InfSectionCommonDef
 from Object.Parser.InfCommonObject import CurrentLine
 from Library.Misc import ConvPathFromAbsToRel
 from Library.ExpressionValidate import IsValidFeatureFlagExp
diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py
index 8998d69889..4efb34d200 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py
@@ -1,10 +1,10 @@
 ## @file
 # This file is used to define class objects of [Defines] section for INF file.
 # It will consumed by InfParser
 #
-# 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
@@ -23,11 +23,11 @@ from Logger import StringTable as ST
 from Logger import ToolError
 from Library import GlobalData
 from Library import DataType as DT
 from Library.StringUtils import GetSplitValueList
 from Library.Misc import CheckGuidRegFormat
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 from Library.Misc import ConvPathFromAbsToRel
 from Library.Misc import ValidateUNIFilePath
 from Library.ExpressionValidate import IsValidFeatureFlagExp
 from Library.ParserValidate import IsValidWord
 from Library.ParserValidate import IsValidInfMoudleType
diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py
index 52c03eed2a..c28c0a90ff 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py
@@ -1,10 +1,10 @@
 ## @file
 # This file is used to define class objects of INF file [Guids] section.
 # It will consumed by InfParser.
 #
-# 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
@@ -18,11 +18,11 @@ InfGuidObject
 
 from Library.ParserValidate import IsValidCVariableName
 from Library.CommentParsing import ParseComment
 from Library.ExpressionValidate import IsValidFeatureFlagExp
 
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 from Library import DataType as DT
 import Logger.Log as Logger
 from Logger import ToolError
 from Logger import StringTable as ST
 
diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfLibraryClassesObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfLibraryClassesObject.py
index 82eca12395..feb546f88b 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfLibraryClassesObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfLibraryClassesObject.py
@@ -1,10 +1,10 @@
 ## @file
 # This file is used to define class objects of INF file [LibraryClasses] section.
 # It will consumed by InfParser.
 #
-# 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
@@ -19,11 +19,11 @@ InfLibraryClassesObject
 from Logger import StringTable as ST
 from Logger import ToolError
 import Logger.Log as Logger
 from Library import GlobalData
 
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 from Object.Parser.InfCommonObject import CurrentLine
 from Library.ExpressionValidate import IsValidFeatureFlagExp
 from Library.ParserValidate import IsValidLibName
 
 ## GetArchModuleType
diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfMisc.py b/BaseTools/Source/Python/UPT/Object/Parser/InfMisc.py
index c75e7d7a3e..f640fd0e31 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfMisc.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfMisc.py
@@ -1,10 +1,10 @@
 ## @file
 # This file is used to define class objects of INF file miscellaneous.
 # Include BootMode/HOB/Event and others. It will consumed by InfParser.
 #
-# 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
@@ -19,11 +19,11 @@ InfMisc
 import Logger.Log as Logger
 from Logger import ToolError
 
 from Library import DataType as DT
 from Object.Parser.InfCommonObject import InfSectionCommonDef
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 
 ##
 # BootModeObject
 #
 class InfBootModeObject():
diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfPackagesObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfPackagesObject.py
index b2ca573549..40582076cc 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfPackagesObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfPackagesObject.py
@@ -1,10 +1,10 @@
 ## @file
 # This file is used to define class objects of INF file [Packages] section.
 # It will consumed by InfParser.
 #
-# 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
@@ -19,11 +19,11 @@ InfPackageObject
 from Logger import StringTable as ST
 from Logger import ToolError
 import Logger.Log as Logger
 from Library import GlobalData
 
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 from Library.ParserValidate import IsValidPath
 from Library.ExpressionValidate import IsValidFeatureFlagExp
 
 class InfPackageItem():
     def __init__(self,
diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py
index b812d3253c..c94bb71333 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py
@@ -1,10 +1,10 @@
 ## @file
 # This file is used to define class objects of INF file [Pcds] section.
 # It will consumed by InfParser.
 #
-# 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
@@ -22,11 +22,11 @@ from Logger import StringTable as ST
 from Logger import ToolError
 import Logger.Log as Logger
 from Library import GlobalData
 from Library import DataType as DT
 
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 from Library.Misc import GetHelpStringByRemoveHashKey
 from Library.ParserValidate import IsValidPcdType
 from Library.ParserValidate import IsValidCVariableName
 from Library.ParserValidate import IsValidPcdValue
 from Library.ParserValidate import IsValidArch
diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py
index b871a5088a..c03be0c9d4 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py
@@ -1,10 +1,10 @@
 ## @file
 # This file is used to define class objects of INF file [Ppis] section.
 # It will consumed by InfParser.
 #
-# 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
@@ -18,11 +18,11 @@ InfPpiObject
 
 from Library.ParserValidate import IsValidCVariableName
 from Library.CommentParsing import ParseComment
 from Library.ExpressionValidate import IsValidFeatureFlagExp
 
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 from Library import DataType as DT
 import Logger.Log as Logger
 from Logger import ToolError
 from Logger import StringTable as ST
 
diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfProtocolObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfProtocolObject.py
index 819d2ff3a7..3276d34c97 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfProtocolObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfProtocolObject.py
@@ -1,10 +1,10 @@
 ## @file
 # This file is used to define class objects of INF file [Protocols] section.
 # It will consumed by InfParser.
 #
-# 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
@@ -18,11 +18,11 @@ InfProtocolObject
 
 from Library.ParserValidate import IsValidCVariableName
 from Library.CommentParsing import ParseComment
 from Library.ExpressionValidate import IsValidFeatureFlagExp
 
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 
 from Object.Parser.InfMisc import ErrorInInf
 
 from Library import DataType as DT
 from Logger import StringTable as ST
diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfSoucesObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfSoucesObject.py
index 3eefde70a5..35ac9728b7 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfSoucesObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfSoucesObject.py
@@ -1,10 +1,10 @@
 ## @file
 # This file is used to define class objects of INF file [Sources] section.
 # It will consumed by InfParser.
 #
-# 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
@@ -21,11 +21,11 @@ import os
 from Logger import StringTable as ST
 from Logger import ToolError
 import Logger.Log as Logger
 from Library import GlobalData
 
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 from Library.ExpressionValidate import IsValidFeatureFlagExp
 from Object.Parser.InfCommonObject import InfSectionCommonDef
 from Library.Misc import ValidFile
 from Library.ParserValidate import IsValidFamily
 from Library.ParserValidate import IsValidPath
diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObject.py
index d83fd5321a..70a126d430 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObject.py
@@ -1,10 +1,10 @@
 ## @file
 # This file is used to define class objects of INF file [UserExtension] section.
 # It will consumed by InfParser.
 #
-# 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
@@ -19,11 +19,11 @@ InfUserExtensionsObject
 from Logger import StringTable as ST
 from Logger import ToolError
 import Logger.Log as Logger
 from Library import GlobalData
 
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 
 class InfUserExtensionItem():
     def __init__(self,
                  Content = '',
                  UserId = '',
diff --git a/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py b/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py
index a7b59d958c..358d995617 100644
--- a/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py
+++ b/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py
@@ -1,9 +1,9 @@
 ## @file DecPomAlignment.py
 # This file contained the adapter for convert INF parser object to POM Object
 #
-# 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
@@ -68,11 +68,11 @@ import Library.DataType as DT
 from Library.CommentParsing import ParseHeaderCommentSection
 from Library.CommentParsing import ParseGenericComment
 from Library.CommentParsing import ParseDecPcdGenericComment
 from Library.CommentParsing import ParseDecPcdTailComment
 from Library.Misc import GetFiles
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 from Library.Misc import GetRelativePath
 from Library.Misc import PathClass
 from Library.Misc import ValidateUNIFilePath
 from Library.UniClassObject import UniFileClassObject
 from Library.UniClassObject import ConvertSpecialUnicodes
diff --git a/BaseTools/Source/Python/UPT/Xml/XmlParser.py b/BaseTools/Source/Python/UPT/Xml/XmlParser.py
index 82f307b3e5..e4b2a3919e 100644
--- a/BaseTools/Source/Python/UPT/Xml/XmlParser.py
+++ b/BaseTools/Source/Python/UPT/Xml/XmlParser.py
@@ -1,9 +1,9 @@
 ## @file
 # This file is used to parse a xml file of .PKG file
 #
-# 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
@@ -28,11 +28,11 @@ from Library.Xml.XmlRoutines import XmlParseFile
 from Core.DistributionPackageClass import DistributionPackageClass
 from Object.POM.ModuleObject import DepexObject
 from Library.ParserValidate import IsValidInfMoudleType
 from Library.ParserValidate import IsValidInstallPath
 from Library.Misc import IsEqualList
-from Library.Misc import Sdict
+from collections import OrderedDict as Sdict
 
 from Logger.StringTable import ERR_XML_INVALID_VARIABLENAME
 from Logger.StringTable import ERR_XML_INVALID_LIB_SUPMODLIST
 from Logger.StringTable import ERR_XML_INVALID_EXTERN_SUPARCHLIST
 from Logger.StringTable import ERR_XML_INVALID_EXTERN_SUPMODLIST
-- 
2.18.0.windows.1