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>

6 files changed, 22 insertions, 22 deletions

diff --git a/BaseTools/Source/Python/UPT/Xml/CommonXml.py b/BaseTools/Source/Python/UPT/Xml/CommonXml.py
index e28aec5b9b..805310de4e 100644
--- a/BaseTools/Source/Python/UPT/Xml/CommonXml.py
+++ b/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

diff --git a/BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py b/BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py
index bfd8d4f7bb..a747b02542 100644
--- a/BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py
+++ b/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

diff --git a/BaseTools/Source/Python/UPT/Xml/IniToXml.py b/BaseTools/Source/Python/UPT/Xml/IniToXml.py
index 037471056d..aa6f23011b 100644
--- a/BaseTools/Source/Python/UPT/Xml/IniToXml.py
+++ b/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

 

diff --git a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
index 51ac48aca5..7480cb575d 100644
--- a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
+++ b/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

diff --git a/BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py b/BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py
index d6ed8c5e3b..30091c6231 100644
--- a/BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py
+++ b/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

diff --git a/BaseTools/Source/Python/UPT/Xml/PcdXml.py b/BaseTools/Source/Python/UPT/Xml/PcdXml.py
index 4603918bab..c0dc654a37 100644
--- a/BaseTools/Source/Python/UPT/Xml/PcdXml.py
+++ b/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