BaseTools/UPT: Update the import statement to use StringUtils

The patch 5a57246eab80 Rename String to StringUtils, but it didn't
update the UPT Tool for the import statement which cause UPT tool
break.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py

@@ -2,7 +2,7 @@
 #
 # This file contained the logical of transfer package object to DEC files.
 #
-# Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -65,7 +65,7 @@ from Library.DataType import TAB_SECTION_END
 from Library.DataType import TAB_SPLIT
 import Library.DataType as DT
 from Library.UniClassObject import FormatUniEntry
-from Library.String import GetUniFileName
+from Library.StringUtils import GetUniFileName
 
 def GenPcd(Package, Content):
     #

BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py

@@ -2,7 +2,7 @@
 #
 # This file contained the logical of transfer package object to INF files.
 #
-# Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -20,7 +20,7 @@ import stat
 import codecs
 import md5
 from Core.FileHook import __FileHookOpen__
-from Library.String import GetSplitValueList
+from Library.StringUtils import GetSplitValueList
 from Library.Parsing import GenSection
 from Library.Parsing import GetWorkspacePackage
 from Library.Parsing import ConvertArchForInstall
@@ -41,7 +41,7 @@ import Logger.Log as Logger
 from Library import DataType as DT
 from GenMetaFile import GenMetaFileMisc
 from Library.UniClassObject import FormatUniEntry
-from Library.String import GetUniFileName
+from Library.StringUtils import GetUniFileName
 
 
 ## Transfer Module Object to Inf files

BaseTools/Source/Python/UPT/Library/CommentGenerating.py

@@ -1,7 +1,7 @@
 ## @file
 # This file is used to define comment generating interface
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -19,7 +19,7 @@ CommentGenerating
 ##
 # Import Modules
 #
-from Library.String import GetSplitValueList
+from Library.StringUtils import GetSplitValueList
 from Library.DataType import TAB_SPACE_SPLIT
 from Library.DataType import TAB_INF_GUIDTYPE_VAR
 from Library.DataType import USAGE_ITEM_NOTIFY

BaseTools/Source/Python/UPT/Library/CommentParsing.py

@@ -1,7 +1,7 @@
 ## @file
 # This file is used to define comment parsing interface
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -21,8 +21,8 @@ CommentParsing
 #
 import re
 
-from Library.String import GetSplitValueList
-from Library.String import CleanString2
+from Library.StringUtils import GetSplitValueList
+from Library.StringUtils import CleanString2
 from Library.DataType import HEADER_COMMENT_NOT_STARTED
 from Library.DataType import TAB_COMMENT_SPLIT
 from Library.DataType import HEADER_COMMENT_LICENSE

BaseTools/Source/Python/UPT/Library/Misc.py

@@ -1,7 +1,7 @@
 ## @file
 # Common routines used by all tools
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -45,7 +45,7 @@ from Library.DataType import TAB_LANGUAGE_EN_US
 from Library.DataType import TAB_LANGUAGE_EN
 from Library.DataType import TAB_LANGUAGE_EN_X
 from Library.DataType import TAB_UNI_FILE_SUFFIXS
-from Library.String import GetSplitValueList
+from Library.StringUtils import GetSplitValueList
 from Library.ParserValidate import IsValidHexVersion
 from Library.ParserValidate import IsValidPath
 from Object.POM.CommonObject import TextObject

BaseTools/Source/Python/UPT/Library/ParserValidate.py

@@ -1,7 +1,7 @@
 ## @file ParserValidate.py
 # Functions for parser validation
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -24,7 +24,7 @@ from Library.DataType import MODULE_LIST
 from Library.DataType import COMPONENT_TYPE_LIST
 from Library.DataType import PCD_USAGE_TYPE_LIST_OF_MODULE
 from Library.DataType import TAB_SPACE_SPLIT
-from Library.String import GetSplitValueList
+from Library.StringUtils import GetSplitValueList
 from Library.ExpressionValidate import IsValidBareCString
 from Library.ExpressionValidate import IsValidFeatureFlagExp
 from Common.MultipleWorkspace import MultipleWorkspace as mws

BaseTools/Source/Python/UPT/Library/Parsing.py

@@ -2,7 +2,7 @@
 # This file is used to define common parsing related functions used in parsing 
 # INF/DEC/DSC process
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -23,12 +23,12 @@ Parsing
 import os.path
 import re
 
-from Library.String import RaiseParserError
-from Library.String import GetSplitValueList
-from Library.String import CheckFileType
-from Library.String import CheckFileExist
-from Library.String import CleanString
-from Library.String import NormPath
+from Library.StringUtils import RaiseParserError
+from Library.StringUtils import GetSplitValueList
+from Library.StringUtils import CheckFileType
+from Library.StringUtils import CheckFileExist
+from Library.StringUtils import CleanString
+from Library.StringUtils import NormPath
 
 from Logger.ToolError import FILE_NOT_FOUND
 from Logger.ToolError import FatalError

BaseTools/Source/Python/UPT/Library/StringUtils.py

@@ -2,7 +2,7 @@
 # This file is used to define common string related functions used in parsing
 # process
 #
-# Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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
@@ -13,7 +13,7 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 '''
-String
+StringUtils
 '''
 ##
 # Import Modules

BaseTools/Source/Python/UPT/Library/UniClassObject.py

@@ -23,7 +23,7 @@ import distutils.util
 from Logger import ToolError
 from Logger import Log as EdkLogger
 from Logger import StringTable as ST
-from Library.String import GetLineNo
+from Library.StringUtils import GetLineNo
 from Library.Misc import PathClass
 from Library.Misc import GetCharIndexOutStr
 from Library import DataType as DT

BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py

@@ -2,7 +2,7 @@
 # This file is used to define class objects of [Defines] section for INF file. 
 # It will consumed by InfParser
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -23,7 +23,7 @@ from Logger import StringTable as ST
 from Logger import ToolError
 from Library import GlobalData 
 from Library import DataType as DT
-from Library.String import GetSplitValueList
+from Library.StringUtils import GetSplitValueList
 from Library.Misc import CheckGuidRegFormat
 from Library.Misc import Sdict
 from Library.Misc import ConvPathFromAbsToRel

BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py

@@ -2,7 +2,7 @@
 # This file is used to define class objects of INF file [Pcds] section. 
 # It will consumed by InfParser. 
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -31,8 +31,8 @@ from Library.ParserValidate import IsValidCVariableName
 from Library.ParserValidate import IsValidPcdValue
 from Library.ParserValidate import IsValidArch
 from Library.CommentParsing import ParseComment
-from Library.String import GetSplitValueList
-from Library.String import IsHexDigitUINT32
+from Library.StringUtils import GetSplitValueList
+from Library.StringUtils import IsHexDigitUINT32
 from Library.ExpressionValidate import IsValidFeatureFlagExp
 from Parser.InfAsBuiltProcess import GetPackageListInfo
 from Parser.DecParser import Dec

BaseTools/Source/Python/UPT/Parser/DecParser.py

@@ -1,7 +1,7 @@
 ## @file
 # This file is used to parse DEC file. It will consumed by DecParser
 #
-# Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -57,10 +57,10 @@ from Object.Parser.DecObject import DecPcdObject
 from Object.Parser.DecObject import DecPcdItemObject
 from Library.Misc import GuidStructureStringToGuidString
 from Library.Misc import CheckGuidRegFormat
-from Library.String import ReplaceMacro
-from Library.String import GetSplitValueList
-from Library.String import gMACRO_PATTERN
-from Library.String import ConvertSpecialChar
+from Library.StringUtils import ReplaceMacro
+from Library.StringUtils import GetSplitValueList
+from Library.StringUtils import gMACRO_PATTERN
+from Library.StringUtils import ConvertSpecialChar
 from Library.CommentParsing import ParsePcdErrorCode
 
 ##

BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py

@@ -1,7 +1,7 @@
 ## @file
 # This file is used to provide method for process AsBuilt INF file. It will consumed by InfParser
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -23,7 +23,7 @@ import Logger.Log as Logger
 from Logger import StringTable as ST
 from Logger import ToolError
 
-from Library.String import GetSplitValueList
+from Library.StringUtils import GetSplitValueList
 from Library.Misc import GetHelpStringByRemoveHashKey
 from Library.Misc import ValidFile
 from Library.Misc import ProcessLineExtender

BaseTools/Source/Python/UPT/Parser/InfParser.py

@@ -1,7 +1,7 @@
 ## @file
 # This file contained the parser for INF file
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -23,8 +23,8 @@ import re
 import os
 from copy import deepcopy
 
-from Library.String import GetSplitValueList
-from Library.String import ConvertSpecialChar
+from Library.StringUtils import GetSplitValueList
+from Library.StringUtils import ConvertSpecialChar
 from Library.Misc import ProcessLineExtender
 from Library.Misc import ProcessEdkComment
 from Library.Parsing import NormPath

BaseTools/Source/Python/UPT/Parser/InfParserMisc.py

@@ -1,7 +1,7 @@
 ## @file
 # This file contained the miscellaneous functions for INF parser 
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -25,8 +25,8 @@ import re
 from Library import DataType as DT
 
 
-from Library.String import gMACRO_PATTERN
-from Library.String import ReplaceMacro
+from Library.StringUtils import gMACRO_PATTERN
+from Library.StringUtils import ReplaceMacro
 from Object.Parser.InfMisc import ErrorInInf
 from Logger.StringTable import ERR_MARCO_DEFINITION_MISS_ERROR
 

BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py

@@ -1,7 +1,7 @@
 ## @file
 # This file contained the parser for [Pcds] sections in INF file 
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -26,7 +26,7 @@ from Library import DataType as DT
 from Library.Parsing import MacroParser
 from Library.Misc import GetSplitValueList
 from Library import GlobalData
-from Library.String import SplitPcdEntry
+from Library.StringUtils import SplitPcdEntry
 from Parser.InfParserMisc import InfParserSectionRoot
 
 class InfPcdSectionParser(InfParserSectionRoot):

BaseTools/Source/Python/UPT/Parser/InfSectionParser.py

@@ -1,7 +1,7 @@
 ## @file
 # This file contained the parser for sections in INF file 
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -21,7 +21,7 @@ InfSectionParser
 from copy import deepcopy
 import re
 
-from Library.String import GetSplitValueList
+from Library.StringUtils import GetSplitValueList
 from Library.CommentParsing import ParseHeaderCommentSection
 from Library.CommentParsing import ParseComment
 

BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py

@@ -1,7 +1,7 @@
 ## @file InfPomAlignment.py
 # This file contained the adapter for convert INF parser object to POM Object
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -20,10 +20,10 @@ InfPomAlignment
 import os.path
 from Logger import StringTable as ST
 import Logger.Log as Logger
-from Library.String import FORMAT_INVALID
-from Library.String import PARSER_ERROR
-from Library.String import NormPath
-from Library.String import GetSplitValueList
+from Library.StringUtils import FORMAT_INVALID
+from Library.StringUtils import PARSER_ERROR
+from Library.StringUtils import NormPath
+from Library.StringUtils import GetSplitValueList
 from Library.Misc import ConvertVersionToDecimal
 from Library.Misc import GetHelpStringByRemoveHashKey
 from Library.Misc import ConvertArchList

BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py

@@ -1,7 +1,7 @@
 ## @file InfPomAlignmentMisc.py
 # This file contained the routines for InfPomAlignment
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -24,7 +24,7 @@ from Library import DataType as DT
 from Library.Misc import ConvertArchList
 from Object.POM.ModuleObject import BinaryFileObject
 from Object.POM import CommonObject
-from Library.String import FORMAT_INVALID
+from Library.StringUtils import FORMAT_INVALID
 from Library.Misc import CheckGuidRegFormat
 from Logger import StringTable as ST
 

BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py

@@ -1,7 +1,7 @@
 ## @file
 # This file contain unit test for CommentParsing
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -28,7 +28,7 @@ from Object.POM.CommonObject import PpiObject
 from Object.POM.CommonObject import PcdObject
 from Object.POM.ModuleObject import HobObject
                                
-from Library.String import GetSplitValueList
+from Library.StringUtils import GetSplitValueList
 from Library.DataType import TAB_SPACE_SPLIT
 from Library.DataType import TAB_LANGUAGE_EN_US
 from Library.DataType import TAB_LANGUAGE_ENG

BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py

@@ -1,7 +1,7 @@
 ## @file
 # This file contain unit test for CommentParsing
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -19,7 +19,7 @@ from Library.CommentParsing import ParseHeaderCommentSection, \
                                    ParseDecPcdGenericComment, \
                                    ParseDecPcdTailComment
 from Library.CommentParsing import _IsCopyrightLine
-from Library.String import GetSplitValueList
+from Library.StringUtils import GetSplitValueList
 from Library.DataType import TAB_SPACE_SPLIT
 from Library.DataType import TAB_LANGUAGE_EN_US
 

BaseTools/Source/Python/UPT/Xml/CommonXml.py

@@ -1,7 +1,7 @@
 ## @file
 # This file is used to parse a PCD file of .PKG file
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -21,10 +21,10 @@ CommonXml
 #
 
 from Core.DistributionPackageClass import DistributionPackageHeaderObject
-from Library.String import ConvertNEToNOTEQ
-from Library.String import ConvertNOTEQToNE
-from Library.String import GetSplitValueList
-from Library.String import GetStringOfList
+from Library.StringUtils import ConvertNEToNOTEQ
+from Library.StringUtils import ConvertNOTEQToNE
+from Library.StringUtils import GetSplitValueList
+from Library.StringUtils import GetStringOfList
 from Library.Xml.XmlRoutines import XmlElement
 from Library.Xml.XmlRoutines import XmlElement2
 from Library.Xml.XmlRoutines import XmlAttribute

BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py

@@ -1,7 +1,7 @@
 ## @file
 # This file is used to parse a xml file of .PKG file
 #
-# Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -15,9 +15,9 @@
 '''
 GuidProtocolPpiXml
 '''
-from Library.String import ConvertNEToNOTEQ
-from Library.String import ConvertNOTEQToNE
-from Library.String import GetStringOfList
+from Library.StringUtils import ConvertNEToNOTEQ
+from Library.StringUtils import ConvertNOTEQToNE
+from Library.StringUtils import GetStringOfList
 from Library.Xml.XmlRoutines import XmlElement
 from Library.Xml.XmlRoutines import XmlAttribute
 from Library.Xml.XmlRoutines import XmlNode

BaseTools/Source/Python/UPT/Xml/IniToXml.py

@@ -1,7 +1,7 @@
 ## @file
 # This file is for converting package information data file to xml file.
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -30,7 +30,7 @@ from Library.DataType import TAB_EQUAL_SPLIT
 from Library.DataType import TAB_SECTION_START
 from Library.DataType import TAB_SECTION_END
 from Logger import StringTable as ST
-from Library.String import ConvertSpecialChar
+from Library.StringUtils import ConvertSpecialChar
 from Library.ParserValidate import IsValidPath
 from Library import GlobalData
 

BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py

@@ -1,7 +1,7 @@
 ## @file
 # This file is used to parse a Module file of .PKG file
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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
@@ -17,10 +17,10 @@ ModuleSurfaceAreaXml
 '''
 from xml.dom import minidom
 
-from Library.String import ConvertNEToNOTEQ
-from Library.String import ConvertNOTEQToNE
-from Library.String import GetStringOfList
-from Library.String import IsMatchArch
+from Library.StringUtils import ConvertNEToNOTEQ
+from Library.StringUtils import ConvertNOTEQToNE
+from Library.StringUtils import GetStringOfList
+from Library.StringUtils import IsMatchArch
 from Library.Xml.XmlRoutines import XmlElement
 from Library.Xml.XmlRoutines import XmlAttribute
 from Library.Xml.XmlRoutines import XmlNode

BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py

@@ -1,7 +1,7 @@
 ## @file
 # This file is used to parse a Package file of .PKG file
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -17,7 +17,7 @@ PackageSurfaceAreaXml
 '''
 from xml.dom import minidom
 
-from Library.String import GetStringOfList
+from Library.StringUtils import GetStringOfList
 from Library.Xml.XmlRoutines import XmlElement
 from Library.Xml.XmlRoutines import XmlNode
 from Library.Xml.XmlRoutines import XmlList

BaseTools/Source/Python/UPT/Xml/PcdXml.py

@@ -1,7 +1,7 @@
 ## @file
 # This file is used to parse a PCD file of .PKG file
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, 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 
@@ -25,9 +25,9 @@ from Library.Xml.XmlRoutines import XmlAttribute
 from Library.Xml.XmlRoutines import XmlNode
 from Library.Xml.XmlRoutines import CreateXmlElement
 from Library.Xml.XmlRoutines import XmlList
-from Library.String import GetStringOfList
-from Library.String import ConvertNEToNOTEQ
-from Library.String import ConvertNOTEQToNE
+from Library.StringUtils import GetStringOfList
+from Library.StringUtils import ConvertNEToNOTEQ
+from Library.StringUtils import ConvertNOTEQToNE
 from Library import GlobalData
 from Object.POM.CommonObject import PcdObject
 from Object.POM.CommonObject import PcdErrorObject