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, 17 insertions, 17 deletions

diff --git a/BaseTools/Source/Python/UPT/Parser/DecParser.py b/BaseTools/Source/Python/UPT/Parser/DecParser.py
index 85b8a17fe4..7ac0dfa1ed 100644
--- a/BaseTools/Source/Python/UPT/Parser/DecParser.py
+++ b/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

 

 ##

diff --git a/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py b/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py
index 4eed04c017..760f28a41f 100644
--- a/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py
+++ b/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

diff --git a/BaseTools/Source/Python/UPT/Parser/InfParser.py b/BaseTools/Source/Python/UPT/Parser/InfParser.py
index 7bea49e0e8..e6048a1d1c 100644
--- a/BaseTools/Source/Python/UPT/Parser/InfParser.py
+++ b/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

diff --git a/BaseTools/Source/Python/UPT/Parser/InfParserMisc.py b/BaseTools/Source/Python/UPT/Parser/InfParserMisc.py
index 6a335e8b6c..df32225aff 100644
--- a/BaseTools/Source/Python/UPT/Parser/InfParserMisc.py
+++ b/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

 

diff --git a/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py b/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py
index a9b87fdc05..13535a3738 100644
--- a/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py
+++ b/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):

diff --git a/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py b/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py
index 727164c2c2..8ba4c3fc08 100644
--- a/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py
+++ b/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