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>

diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py b/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py
index d39c1827ba2674925df53b34d17bd879ae782bfb..9397359367e7ae84124f87184f881e712cd15c30 100644 (file)
--- a/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py
+++ b/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py
@@ -2,7 +2,7 @@
 #\r
 # This file contained the logical of transfer package object to DEC files.\r
 #\r
-# Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -65,7 +65,7 @@ from Library.DataType import TAB_SECTION_END
 from Library.DataType import TAB_SPLIT\r
 import Library.DataType as DT\r
 from Library.UniClassObject import FormatUniEntry\r
-from Library.String import GetUniFileName\r
+from Library.StringUtils import GetUniFileName\r
 \r
 def GenPcd(Package, Content):\r
     #\r

diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
index 9373a144190d2126744376c88bef06ede2eae23f..bfd422b196ba0f6abe977be825d333e9221bdc7f 100644 (file)
--- a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
+++ b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
@@ -2,7 +2,7 @@
 #\r
 # This file contained the logical of transfer package object to INF files.\r
 #\r
-# Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -20,7 +20,7 @@ import stat
 import codecs\r
 import md5\r
 from Core.FileHook import __FileHookOpen__\r
-from Library.String import GetSplitValueList\r
+from Library.StringUtils import GetSplitValueList\r
 from Library.Parsing import GenSection\r
 from Library.Parsing import GetWorkspacePackage\r
 from Library.Parsing import ConvertArchForInstall\r
@@ -41,7 +41,7 @@ import Logger.Log as Logger
 from Library import DataType as DT\r
 from GenMetaFile import GenMetaFileMisc\r
 from Library.UniClassObject import FormatUniEntry\r
-from Library.String import GetUniFileName\r
+from Library.StringUtils import GetUniFileName\r
 \r
 \r
 ## Transfer Module Object to Inf files\r

diff --git a/BaseTools/Source/Python/UPT/Library/CommentGenerating.py b/BaseTools/Source/Python/UPT/Library/CommentGenerating.py
index 9c6e3aad9fcdeadd9ff74dc94ac35b7501fce3b7..ab1725ff0ef249a2a888d28d20e22aac2c71a92f 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/CommentGenerating.py
+++ b/BaseTools/Source/Python/UPT/Library/CommentGenerating.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is used to define comment generating interface\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -19,7 +19,7 @@ CommentGenerating
 ##\r
 # Import Modules\r
 #\r
-from Library.String import GetSplitValueList\r
+from Library.StringUtils import GetSplitValueList\r
 from Library.DataType import TAB_SPACE_SPLIT\r
 from Library.DataType import TAB_INF_GUIDTYPE_VAR\r
 from Library.DataType import USAGE_ITEM_NOTIFY\r

diff --git a/BaseTools/Source/Python/UPT/Library/CommentParsing.py b/BaseTools/Source/Python/UPT/Library/CommentParsing.py
index 38f7012fd4f8f823325004a8a64c411220299e30..4713614c4a45dd85e8905481d3fb7c9735b5c8c8 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/CommentParsing.py
+++ b/BaseTools/Source/Python/UPT/Library/CommentParsing.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is used to define comment parsing interface\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -21,8 +21,8 @@ CommentParsing
 #\r
 import re\r
 \r
-from Library.String import GetSplitValueList\r
-from Library.String import CleanString2\r
+from Library.StringUtils import GetSplitValueList\r
+from Library.StringUtils import CleanString2\r
 from Library.DataType import HEADER_COMMENT_NOT_STARTED\r
 from Library.DataType import TAB_COMMENT_SPLIT\r
 from Library.DataType import HEADER_COMMENT_LICENSE\r

diff --git a/BaseTools/Source/Python/UPT/Library/Misc.py b/BaseTools/Source/Python/UPT/Library/Misc.py
index 719445b3bd9ab0b2c69b66310cc6d8b759fb1f29..e16d309ef8838a52bb43ad061f96263976c968dd 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/Misc.py
+++ b/BaseTools/Source/Python/UPT/Library/Misc.py
@@ -1,7 +1,7 @@
 ## @file\r
 # Common routines used by all tools\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -45,7 +45,7 @@ from Library.DataType import TAB_LANGUAGE_EN_US
 from Library.DataType import TAB_LANGUAGE_EN\r
 from Library.DataType import TAB_LANGUAGE_EN_X\r
 from Library.DataType import TAB_UNI_FILE_SUFFIXS\r
-from Library.String import GetSplitValueList\r
+from Library.StringUtils import GetSplitValueList\r
 from Library.ParserValidate import IsValidHexVersion\r
 from Library.ParserValidate import IsValidPath\r
 from Object.POM.CommonObject import TextObject\r

diff --git a/BaseTools/Source/Python/UPT/Library/ParserValidate.py b/BaseTools/Source/Python/UPT/Library/ParserValidate.py
index 2def90a93b5132712bb99c25b729af563ecc2815..3f8ca9d609aec524cf9f2d999678230bc0ae2b90 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/ParserValidate.py
+++ b/BaseTools/Source/Python/UPT/Library/ParserValidate.py
@@ -1,7 +1,7 @@
 ## @file ParserValidate.py\r
 # Functions for parser validation\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -24,7 +24,7 @@ from Library.DataType import MODULE_LIST
 from Library.DataType import COMPONENT_TYPE_LIST\r
 from Library.DataType import PCD_USAGE_TYPE_LIST_OF_MODULE\r
 from Library.DataType import TAB_SPACE_SPLIT\r
-from Library.String import GetSplitValueList\r
+from Library.StringUtils import GetSplitValueList\r
 from Library.ExpressionValidate import IsValidBareCString\r
 from Library.ExpressionValidate import IsValidFeatureFlagExp\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r

diff --git a/BaseTools/Source/Python/UPT/Library/Parsing.py b/BaseTools/Source/Python/UPT/Library/Parsing.py
index 791e064761c06ae6f8671fd80d0c3301347fc569..22030e7587c1ae51612640d8cb9f75a46d43cee6 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/Parsing.py
+++ b/BaseTools/Source/Python/UPT/Library/Parsing.py
@@ -2,7 +2,7 @@
 # This file is used to define common parsing related functions used in parsing \r
 # INF/DEC/DSC process\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -23,12 +23,12 @@ Parsing
 import os.path\r
 import re\r
 \r
-from Library.String import RaiseParserError\r
-from Library.String import GetSplitValueList\r
-from Library.String import CheckFileType\r
-from Library.String import CheckFileExist\r
-from Library.String import CleanString\r
-from Library.String import NormPath\r
+from Library.StringUtils import RaiseParserError\r
+from Library.StringUtils import GetSplitValueList\r
+from Library.StringUtils import CheckFileType\r
+from Library.StringUtils import CheckFileExist\r
+from Library.StringUtils import CleanString\r
+from Library.StringUtils import NormPath\r
 \r
 from Logger.ToolError import FILE_NOT_FOUND\r
 from Logger.ToolError import FatalError\r

diff --git a/BaseTools/Source/Python/UPT/Library/StringUtils.py b/BaseTools/Source/Python/UPT/Library/StringUtils.py
index b79891ea1417452d40c666f582a4bfbea523c179..a7a7b8667143bab9f497263f98e85c1f35138dfe 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/StringUtils.py
+++ b/BaseTools/Source/Python/UPT/Library/StringUtils.py
@@ -2,7 +2,7 @@
 # This file is used to define common string related functions used in parsing\r
 # process\r
 #\r
-# Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available\r
 # under the terms and conditions of the BSD License which accompanies this\r
@@ -13,7 +13,7 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 '''\r
-String\r
+StringUtils\r
 '''\r
 ##\r
 # Import Modules\r

diff --git a/BaseTools/Source/Python/UPT/Library/UniClassObject.py b/BaseTools/Source/Python/UPT/Library/UniClassObject.py
index 66eefee9db31041aa2a92cfa6ebc74bc2ef6afef..7dcf0cf6558b84717f543216163f317d39fb6ea3 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/UniClassObject.py
+++ b/BaseTools/Source/Python/UPT/Library/UniClassObject.py
@@ -23,7 +23,7 @@ import distutils.util
 from Logger import ToolError\r
 from Logger import Log as EdkLogger\r
 from Logger import StringTable as ST\r
-from Library.String import GetLineNo\r
+from Library.StringUtils import GetLineNo\r
 from Library.Misc import PathClass\r
 from Library.Misc import GetCharIndexOutStr\r
 from Library import DataType as DT\r

diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py
index bbc797f65e3783ef0977c4172a3d0ddb263aca6f..3995546593d857e4530d94b2550791203f31a1e4 100644 (file)
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py
+++ b/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. \r
 # It will consumed by InfParser\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -23,7 +23,7 @@ from Logger import StringTable as ST
 from Logger import ToolError\r
 from Library import GlobalData \r
 from Library import DataType as DT\r
-from Library.String import GetSplitValueList\r
+from Library.StringUtils import GetSplitValueList\r
 from Library.Misc import CheckGuidRegFormat\r
 from Library.Misc import Sdict\r
 from Library.Misc import ConvPathFromAbsToRel\r

diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py
index d2712a97f2ff34c1be8f3ab22b33d521ff0e90eb..62c1e8409a09b2eaf0856fe98516239129e2f925 100644 (file)
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py
+++ b/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. \r
 # It will consumed by InfParser. \r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -31,8 +31,8 @@ from Library.ParserValidate import IsValidCVariableName
 from Library.ParserValidate import IsValidPcdValue\r
 from Library.ParserValidate import IsValidArch\r
 from Library.CommentParsing import ParseComment\r
-from Library.String import GetSplitValueList\r
-from Library.String import IsHexDigitUINT32\r
+from Library.StringUtils import GetSplitValueList\r
+from Library.StringUtils import IsHexDigitUINT32\r
 from Library.ExpressionValidate import IsValidFeatureFlagExp\r
 from Parser.InfAsBuiltProcess import GetPackageListInfo\r
 from Parser.DecParser import Dec\r

diff --git a/BaseTools/Source/Python/UPT/Parser/DecParser.py b/BaseTools/Source/Python/UPT/Parser/DecParser.py
index 85b8a17fe4d8e856e13ef9bc5d2b305172693779..7ac0dfa1ed944ef50b9a69b55d61bd2e9fbc3d2c 100644 (file)
--- a/BaseTools/Source/Python/UPT/Parser/DecParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/DecParser.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is used to parse DEC file. It will consumed by DecParser\r
 #\r
-# Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -57,10 +57,10 @@ from Object.Parser.DecObject import DecPcdObject
 from Object.Parser.DecObject import DecPcdItemObject\r
 from Library.Misc import GuidStructureStringToGuidString\r
 from Library.Misc import CheckGuidRegFormat\r
-from Library.String import ReplaceMacro\r
-from Library.String import GetSplitValueList\r
-from Library.String import gMACRO_PATTERN\r
-from Library.String import ConvertSpecialChar\r
+from Library.StringUtils import ReplaceMacro\r
+from Library.StringUtils import GetSplitValueList\r
+from Library.StringUtils import gMACRO_PATTERN\r
+from Library.StringUtils import ConvertSpecialChar\r
 from Library.CommentParsing import ParsePcdErrorCode\r
 \r
 ##\r

diff --git a/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py b/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py
index 4eed04c01765d85c1a240423141cec76d7de9788..760f28a41f6fe1ba68dc5656a46ed1938af5f3c2 100644 (file)
--- a/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is used to provide method for process AsBuilt INF file. It will consumed by InfParser\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -23,7 +23,7 @@ import Logger.Log as Logger
 from Logger import StringTable as ST\r
 from Logger import ToolError\r
 \r
-from Library.String import GetSplitValueList\r
+from Library.StringUtils import GetSplitValueList\r
 from Library.Misc import GetHelpStringByRemoveHashKey\r
 from Library.Misc import ValidFile\r
 from Library.Misc import ProcessLineExtender\r

diff --git a/BaseTools/Source/Python/UPT/Parser/InfParser.py b/BaseTools/Source/Python/UPT/Parser/InfParser.py
index 7bea49e0e8616d68d9950aa726da868e28362937..e6048a1d1ca9768f220f363f03f69b51a7cd1d0c 100644 (file)
--- a/BaseTools/Source/Python/UPT/Parser/InfParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfParser.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file contained the parser for INF file\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -23,8 +23,8 @@ import re
 import os\r
 from copy import deepcopy\r
 \r
-from Library.String import GetSplitValueList\r
-from Library.String import ConvertSpecialChar\r
+from Library.StringUtils import GetSplitValueList\r
+from Library.StringUtils import ConvertSpecialChar\r
 from Library.Misc import ProcessLineExtender\r
 from Library.Misc import ProcessEdkComment\r
 from Library.Parsing import NormPath\r

diff --git a/BaseTools/Source/Python/UPT/Parser/InfParserMisc.py b/BaseTools/Source/Python/UPT/Parser/InfParserMisc.py
index 6a335e8b6c75fee729bb1d240bf39e06c2b51b5e..df32225aff039a7cb6bd3dcee7270404499e6ec7 100644 (file)
--- a/BaseTools/Source/Python/UPT/Parser/InfParserMisc.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfParserMisc.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file contained the miscellaneous functions for INF parser \r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -25,8 +25,8 @@ import re
 from Library import DataType as DT\r
 \r
 \r
-from Library.String import gMACRO_PATTERN\r
-from Library.String import ReplaceMacro\r
+from Library.StringUtils import gMACRO_PATTERN\r
+from Library.StringUtils import ReplaceMacro\r
 from Object.Parser.InfMisc import ErrorInInf\r
 from Logger.StringTable import ERR_MARCO_DEFINITION_MISS_ERROR\r
 \r

diff --git a/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py b/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py
index a9b87fdc0565622ca71e67c174f67408dd200bce..13535a3738eabf9f115fbb724f69b2d954385c64 100644 (file)
--- a/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file contained the parser for [Pcds] sections in INF file \r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -26,7 +26,7 @@ from Library import DataType as DT
 from Library.Parsing import MacroParser\r
 from Library.Misc import GetSplitValueList\r
 from Library import GlobalData\r
-from Library.String import SplitPcdEntry\r
+from Library.StringUtils import SplitPcdEntry\r
 from Parser.InfParserMisc import InfParserSectionRoot\r
 \r
 class InfPcdSectionParser(InfParserSectionRoot):\r

diff --git a/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py b/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py
index 727164c2c244954eac5f55f484d6c45f0ed5dc7c..8ba4c3fc0819265a5d11b4abc395322a5ef3051d 100644 (file)
--- a/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file contained the parser for sections in INF file \r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -21,7 +21,7 @@ InfSectionParser
 from copy import deepcopy\r
 import re\r
 \r
-from Library.String import GetSplitValueList\r
+from Library.StringUtils import GetSplitValueList\r
 from Library.CommentParsing import ParseHeaderCommentSection\r
 from Library.CommentParsing import ParseComment\r
 \r

diff --git a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
index 165ac111272a23a6da56c7d4c3c4900bf3936106..a5929e15de2d68d6677fce10ae4683b658f21cce 100644 (file)
--- a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
+++ b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
@@ -1,7 +1,7 @@
 ## @file InfPomAlignment.py\r
 # This file contained the adapter for convert INF parser object to POM Object\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -20,10 +20,10 @@ InfPomAlignment
 import os.path\r
 from Logger import StringTable as ST\r
 import Logger.Log as Logger\r
-from Library.String import FORMAT_INVALID\r
-from Library.String import PARSER_ERROR\r
-from Library.String import NormPath\r
-from Library.String import GetSplitValueList\r
+from Library.StringUtils import FORMAT_INVALID\r
+from Library.StringUtils import PARSER_ERROR\r
+from Library.StringUtils import NormPath\r
+from Library.StringUtils import GetSplitValueList\r
 from Library.Misc import ConvertVersionToDecimal\r
 from Library.Misc import GetHelpStringByRemoveHashKey\r
 from Library.Misc import ConvertArchList\r

diff --git a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py
index cca70e5640428efee922907b21fab847f6ed7e4b..cee42516231ccbaf3011b2379bf30928273b0ac3 100644 (file)
--- a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py
+++ b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py
@@ -1,7 +1,7 @@
 ## @file InfPomAlignmentMisc.py\r
 # This file contained the routines for InfPomAlignment\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -24,7 +24,7 @@ from Library import DataType as DT
 from Library.Misc import ConvertArchList\r
 from Object.POM.ModuleObject import BinaryFileObject\r
 from Object.POM import CommonObject\r
-from Library.String import FORMAT_INVALID\r
+from Library.StringUtils import FORMAT_INVALID\r
 from Library.Misc import CheckGuidRegFormat\r
 from Logger import StringTable as ST\r
 \r

diff --git a/BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py b/BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py
index 42a2ba3a6b3014c93892818c8d58f51e74d0d56d..9c50d2dc60be7067a900c41566d70a92a06ac989 100644 (file)
--- a/BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py
+++ b/BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file contain unit test for CommentParsing\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -28,7 +28,7 @@ from Object.POM.CommonObject import PpiObject
 from Object.POM.CommonObject import PcdObject\r
 from Object.POM.ModuleObject import HobObject\r
                                \r
-from Library.String import GetSplitValueList\r
+from Library.StringUtils import GetSplitValueList\r
 from Library.DataType import TAB_SPACE_SPLIT\r
 from Library.DataType import TAB_LANGUAGE_EN_US\r
 from Library.DataType import TAB_LANGUAGE_ENG\r

diff --git a/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py b/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py
index a114ff22a739dc52aca3eac5d42ce6a9da17381e..4593506e58d5261f3ebc7636fd744c7dfcfe2202 100644 (file)
--- a/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py
+++ b/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file contain unit test for CommentParsing\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -19,7 +19,7 @@ from Library.CommentParsing import ParseHeaderCommentSection, \
                                    ParseDecPcdGenericComment, \\r
                                    ParseDecPcdTailComment\r
 from Library.CommentParsing import _IsCopyrightLine\r
-from Library.String import GetSplitValueList\r
+from Library.StringUtils import GetSplitValueList\r
 from Library.DataType import TAB_SPACE_SPLIT\r
 from Library.DataType import TAB_LANGUAGE_EN_US\r
 \r

diff --git a/BaseTools/Source/Python/UPT/Xml/CommonXml.py b/BaseTools/Source/Python/UPT/Xml/CommonXml.py
index e28aec5b9b058f7c99e255e87629853f508ba66a..805310de4e463d2ca6d5f18c83447dcd87d17772 100644 (file)
--- a/BaseTools/Source/Python/UPT/Xml/CommonXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/CommonXml.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is used to parse a PCD file of .PKG file\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -21,10 +21,10 @@ CommonXml
 #\r
 \r
 from Core.DistributionPackageClass import DistributionPackageHeaderObject\r
-from Library.String import ConvertNEToNOTEQ\r
-from Library.String import ConvertNOTEQToNE\r
-from Library.String import GetSplitValueList\r
-from Library.String import GetStringOfList\r
+from Library.StringUtils import ConvertNEToNOTEQ\r
+from Library.StringUtils import ConvertNOTEQToNE\r
+from Library.StringUtils import GetSplitValueList\r
+from Library.StringUtils import GetStringOfList\r
 from Library.Xml.XmlRoutines import XmlElement\r
 from Library.Xml.XmlRoutines import XmlElement2\r
 from Library.Xml.XmlRoutines import XmlAttribute\r

diff --git a/BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py b/BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py
index bfd8d4f7bb80905dae794765b6283eac98684b81..a747b02542856d67eeb5b363c5abc8e36aa7971f 100644 (file)
--- a/BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is used to parse a xml file of .PKG file\r
 #\r
-# Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -15,9 +15,9 @@
 '''\r
 GuidProtocolPpiXml\r
 '''\r
-from Library.String import ConvertNEToNOTEQ\r
-from Library.String import ConvertNOTEQToNE\r
-from Library.String import GetStringOfList\r
+from Library.StringUtils import ConvertNEToNOTEQ\r
+from Library.StringUtils import ConvertNOTEQToNE\r
+from Library.StringUtils import GetStringOfList\r
 from Library.Xml.XmlRoutines import XmlElement\r
 from Library.Xml.XmlRoutines import XmlAttribute\r
 from Library.Xml.XmlRoutines import XmlNode\r

diff --git a/BaseTools/Source/Python/UPT/Xml/IniToXml.py b/BaseTools/Source/Python/UPT/Xml/IniToXml.py
index 037471056d81fc40b8053c91e3325e4fddb71d2e..aa6f23011b17e805dccbcdc827a39f71b5bdf14c 100644 (file)
--- a/BaseTools/Source/Python/UPT/Xml/IniToXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/IniToXml.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is for converting package information data file to xml file.\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -30,7 +30,7 @@ from Library.DataType import TAB_EQUAL_SPLIT
 from Library.DataType import TAB_SECTION_START\r
 from Library.DataType import TAB_SECTION_END\r
 from Logger import StringTable as ST\r
-from Library.String import ConvertSpecialChar\r
+from Library.StringUtils import ConvertSpecialChar\r
 from Library.ParserValidate import IsValidPath\r
 from Library import GlobalData\r
 \r

diff --git a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
index 51ac48aca58e02a5e52c8e5643578be09de4b472..7480cb575d74c2427cb806dc39739cd3e4fdb3e7 100644 (file)
--- a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is used to parse a Module file of .PKG file\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available\r
 # under the terms and conditions of the BSD License which accompanies this\r
@@ -17,10 +17,10 @@ ModuleSurfaceAreaXml
 '''\r
 from xml.dom import minidom\r
 \r
-from Library.String import ConvertNEToNOTEQ\r
-from Library.String import ConvertNOTEQToNE\r
-from Library.String import GetStringOfList\r
-from Library.String import IsMatchArch\r
+from Library.StringUtils import ConvertNEToNOTEQ\r
+from Library.StringUtils import ConvertNOTEQToNE\r
+from Library.StringUtils import GetStringOfList\r
+from Library.StringUtils import IsMatchArch\r
 from Library.Xml.XmlRoutines import XmlElement\r
 from Library.Xml.XmlRoutines import XmlAttribute\r
 from Library.Xml.XmlRoutines import XmlNode\r

diff --git a/BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py b/BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py
index d6ed8c5e3b41443497816580bcb52e85c1f102be..30091c6231ed01ecb7e96b785593a254ff9d9558 100644 (file)
--- a/BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is used to parse a Package file of .PKG file\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -17,7 +17,7 @@ PackageSurfaceAreaXml
 '''\r
 from xml.dom import minidom\r
 \r
-from Library.String import GetStringOfList\r
+from Library.StringUtils import GetStringOfList\r
 from Library.Xml.XmlRoutines import XmlElement\r
 from Library.Xml.XmlRoutines import XmlNode\r
 from Library.Xml.XmlRoutines import XmlList\r

diff --git a/BaseTools/Source/Python/UPT/Xml/PcdXml.py b/BaseTools/Source/Python/UPT/Xml/PcdXml.py
index 4603918babcbf5bfe2404070b7861b39a7017245..c0dc654a3743c03c9cdbccf4c6fc7c6206499717 100644 (file)
--- a/BaseTools/Source/Python/UPT/Xml/PcdXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/PcdXml.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is used to parse a PCD file of .PKG file\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -25,9 +25,9 @@ from Library.Xml.XmlRoutines import XmlAttribute
 from Library.Xml.XmlRoutines import XmlNode\r
 from Library.Xml.XmlRoutines import CreateXmlElement\r
 from Library.Xml.XmlRoutines import XmlList\r
-from Library.String import GetStringOfList\r
-from Library.String import ConvertNEToNOTEQ\r
-from Library.String import ConvertNOTEQToNE\r
+from Library.StringUtils import GetStringOfList\r
+from Library.StringUtils import ConvertNEToNOTEQ\r
+from Library.StringUtils import ConvertNOTEQToNE\r
 from Library import GlobalData\r
 from Object.POM.CommonObject import PcdObject\r
 from Object.POM.CommonObject import PcdErrorObject\r