BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py | 4 ++-- BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py | 6 +++--- BaseTools/Source/Python/UPT/Library/CommentGenerating.py | 4 ++-- BaseTools/Source/Python/UPT/Library/CommentParsing.py | 6 +++--- BaseTools/Source/Python/UPT/Library/Misc.py | 4 ++-- BaseTools/Source/Python/UPT/Library/ParserValidate.py | 4 ++-- BaseTools/Source/Python/UPT/Library/Parsing.py | 14 +++++++------- BaseTools/Source/Python/UPT/Library/StringUtils.py | 4 ++-- BaseTools/Source/Python/UPT/Library/UniClassObject.py | 2 +- .../Source/Python/UPT/Object/Parser/InfDefineObject.py | 4 ++-- BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py | 6 +++--- BaseTools/Source/Python/UPT/Parser/DecParser.py | 10 +++++----- BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py | 4 ++-- BaseTools/Source/Python/UPT/Parser/InfParser.py | 6 +++--- BaseTools/Source/Python/UPT/Parser/InfParserMisc.py | 6 +++--- BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py | 4 ++-- BaseTools/Source/Python/UPT/Parser/InfSectionParser.py | 4 ++-- BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py | 10 +++++----- .../Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py | 4 ++-- .../Python/UPT/UnitTest/CommentGeneratingUnitTest.py | 4 ++-- .../Source/Python/UPT/UnitTest/CommentParsingUnitTest.py | 4 ++-- BaseTools/Source/Python/UPT/Xml/CommonXml.py | 10 +++++----- BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py | 8 ++++---- BaseTools/Source/Python/UPT/Xml/IniToXml.py | 4 ++-- BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py | 10 +++++----- BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py | 4 ++-- BaseTools/Source/Python/UPT/Xml/PcdXml.py | 8 ++++---- 27 files changed, 79 insertions(+), 79 deletions(-)
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>
---
BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py | 4 ++--
BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py | 6 +++---
BaseTools/Source/Python/UPT/Library/CommentGenerating.py | 4 ++--
BaseTools/Source/Python/UPT/Library/CommentParsing.py | 6 +++---
BaseTools/Source/Python/UPT/Library/Misc.py | 4 ++--
BaseTools/Source/Python/UPT/Library/ParserValidate.py | 4 ++--
BaseTools/Source/Python/UPT/Library/Parsing.py | 14 +++++++-------
BaseTools/Source/Python/UPT/Library/StringUtils.py | 4 ++--
BaseTools/Source/Python/UPT/Library/UniClassObject.py | 2 +-
.../Source/Python/UPT/Object/Parser/InfDefineObject.py | 4 ++--
BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py | 6 +++---
BaseTools/Source/Python/UPT/Parser/DecParser.py | 10 +++++-----
BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py | 4 ++--
BaseTools/Source/Python/UPT/Parser/InfParser.py | 6 +++---
BaseTools/Source/Python/UPT/Parser/InfParserMisc.py | 6 +++---
BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py | 4 ++--
BaseTools/Source/Python/UPT/Parser/InfSectionParser.py | 4 ++--
BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py | 10 +++++-----
.../Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py | 4 ++--
.../Python/UPT/UnitTest/CommentGeneratingUnitTest.py | 4 ++--
.../Source/Python/UPT/UnitTest/CommentParsingUnitTest.py | 4 ++--
BaseTools/Source/Python/UPT/Xml/CommonXml.py | 10 +++++-----
BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py | 8 ++++----
BaseTools/Source/Python/UPT/Xml/IniToXml.py | 4 ++--
BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py | 10 +++++-----
BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py | 4 ++--
BaseTools/Source/Python/UPT/Xml/PcdXml.py | 8 ++++----
27 files changed, 79 insertions(+), 79 deletions(-)
diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py b/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py
index d39c182..9397359 100644
--- a/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py
+++ b/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py
@@ -1,10 +1,10 @@
## @file GenDecFile.py
#
# 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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -63,11 +63,11 @@ from Library.DataType import TAB_PCD_ERROR
from Library.DataType import TAB_SECTION_START
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):
#
# generate [Pcd] section
# <TokenSpcCName>.<TokenCName>|<Value>|<DatumType>|<Token>
diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
index 9373a14..bfd422b 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 - 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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -18,11 +18,11 @@ GenInf
import os
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
from Library.Misc import SaveFileOnChange
from Library.Misc import IsAllModuleList
@@ -39,11 +39,11 @@ from Logger import StringTable as ST
from Logger import ToolError
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
#
# Transfer all contents of a standard Module Object to an Inf file
diff --git a/BaseTools/Source/Python/UPT/Library/CommentGenerating.py b/BaseTools/Source/Python/UPT/Library/CommentGenerating.py
index 9c6e3aa..ab1725f 100644
--- a/BaseTools/Source/Python/UPT/Library/CommentGenerating.py
+++ b/BaseTools/Source/Python/UPT/Library/CommentGenerating.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -17,11 +17,11 @@ 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
from Library.DataType import ITEM_UNDEFINED
from Library.DataType import TAB_HEADER_COMMENT
diff --git a/BaseTools/Source/Python/UPT/Library/CommentParsing.py b/BaseTools/Source/Python/UPT/Library/CommentParsing.py
index 38f7012..4713614 100644
--- a/BaseTools/Source/Python/UPT/Library/CommentParsing.py
+++ b/BaseTools/Source/Python/UPT/Library/CommentParsing.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -19,12 +19,12 @@ CommentParsing
##
# Import Modules
#
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
from Library.DataType import HEADER_COMMENT_ABSTRACT
from Library.DataType import HEADER_COMMENT_COPYRIGHT
diff --git a/BaseTools/Source/Python/UPT/Library/Misc.py b/BaseTools/Source/Python/UPT/Library/Misc.py
index 719445b..e16d309 100644
--- a/BaseTools/Source/Python/UPT/Library/Misc.py
+++ b/BaseTools/Source/Python/UPT/Library/Misc.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -43,11 +43,11 @@ from Library.DataType import END_OF_LINE
from Library.DataType import TAB_SPLIT
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
from Core.FileHook import __FileHookOpen__
from Common.MultipleWorkspace import MultipleWorkspace as mws
diff --git a/BaseTools/Source/Python/UPT/Library/ParserValidate.py b/BaseTools/Source/Python/UPT/Library/ParserValidate.py
index 2def90a..3f8ca9d 100644
--- a/BaseTools/Source/Python/UPT/Library/ParserValidate.py
+++ b/BaseTools/Source/Python/UPT/Library/ParserValidate.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -22,11 +22,11 @@ import platform
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
## __HexDigit() method
diff --git a/BaseTools/Source/Python/UPT/Library/Parsing.py b/BaseTools/Source/Python/UPT/Library/Parsing.py
index 791e064..22030e7 100644
--- a/BaseTools/Source/Python/UPT/Library/Parsing.py
+++ b/BaseTools/Source/Python/UPT/Library/Parsing.py
@@ -1,10 +1,10 @@
## @file
# 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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -21,16 +21,16 @@ Parsing
# Import Modules
#
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
from Logger.ToolError import FORMAT_INVALID
diff --git a/BaseTools/Source/Python/UPT/Library/StringUtils.py b/BaseTools/Source/Python/UPT/Library/StringUtils.py
index b79891e..a7a7b86 100644
--- a/BaseTools/Source/Python/UPT/Library/StringUtils.py
+++ b/BaseTools/Source/Python/UPT/Library/StringUtils.py
@@ -1,21 +1,21 @@
## @file
# 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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
#
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
'''
-String
+StringUtils
'''
##
# Import Modules
#
import re
diff --git a/BaseTools/Source/Python/UPT/Library/UniClassObject.py b/BaseTools/Source/Python/UPT/Library/UniClassObject.py
index 66eefee..7dcf0cf 100644
--- a/BaseTools/Source/Python/UPT/Library/UniClassObject.py
+++ b/BaseTools/Source/Python/UPT/Library/UniClassObject.py
@@ -21,11 +21,11 @@ Collect all defined strings in multiple uni files
import os, codecs, re
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
from Library.ParserValidate import CheckUTF16FileHeader
diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py
index bbc797f..3995546 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 - 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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -21,11 +21,11 @@ import re
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
from Library.Misc import ValidateUNIFilePath
from Library.ExpressionValidate import IsValidFeatureFlagExp
diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py
index d2712a9..62c1e84 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 - 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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -29,12 +29,12 @@ 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
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
from Object.Parser.InfPackagesObject import InfPackageItem
diff --git a/BaseTools/Source/Python/UPT/Parser/DecParser.py b/BaseTools/Source/Python/UPT/Parser/DecParser.py
index 85b8a17..7ac0dfa 100644
--- a/BaseTools/Source/Python/UPT/Parser/DecParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/DecParser.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -55,14 +55,14 @@ from Object.Parser.DecObject import DecUserExtensionObject
from Object.Parser.DecObject import DecUserExtensionItemObject
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
##
# _DecBase class for parsing
#
diff --git a/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py b/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py
index 4eed04c..760f28a 100644
--- a/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -21,11 +21,11 @@ import re
from Library import GlobalData
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
from Library.ParserValidate import IsValidPath
from Library.Parsing import MacroParser
diff --git a/BaseTools/Source/Python/UPT/Parser/InfParser.py b/BaseTools/Source/Python/UPT/Parser/InfParser.py
index 7bea49e..e6048a1 100644
--- a/BaseTools/Source/Python/UPT/Parser/InfParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfParser.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -21,12 +21,12 @@ InfParser
#
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
from Library.ParserValidate import IsValidInfMoudleTypeList
from Library.ParserValidate import IsValidArch
diff --git a/BaseTools/Source/Python/UPT/Parser/InfParserMisc.py b/BaseTools/Source/Python/UPT/Parser/InfParserMisc.py
index 6a335e8..df32225 100644
--- a/BaseTools/Source/Python/UPT/Parser/InfParserMisc.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfParserMisc.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -23,12 +23,12 @@ 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
#
# Global variable
diff --git a/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py b/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py
index a9b87fd..13535a37 100644
--- a/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -24,11 +24,11 @@ from Logger.ToolError import FORMAT_INVALID
from Parser.InfParserMisc import InfExpandMacro
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):
## Section PCD related parser
#
diff --git a/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py b/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py
index 727164c..8ba4c3f 100644
--- a/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -19,11 +19,11 @@ InfSectionParser
# Import Modules
#
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
from Library import DataType as DT
diff --git a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
index 165ac11..a5929e1 100644
--- a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
+++ b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -18,14 +18,14 @@ InfPomAlignment
# Import modules
#
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
from Library.Misc import GetRelativePath
from Library.Misc import PathClass
diff --git a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py
index cca70e5..cee4251 100644
--- a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py
+++ b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -22,11 +22,11 @@ InfPomAlignmentMisc
import Logger.Log as Logger
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
## GenModuleHeaderUserExt
diff --git a/BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py b/BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py
index 42a2ba3..9c50d2d 100644
--- a/BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py
+++ b/BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -26,11 +26,11 @@ from Object.POM.CommonObject import GuidObject
from Object.POM.CommonObject import ProtocolObject
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
from Library.DataType import ITEM_UNDEFINED
from Library.DataType import TAB_INF_FEATURE_PCD
diff --git a/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py b/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py
index a114ff2..4593506 100644
--- a/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py
+++ b/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -17,11 +17,11 @@ import Logger.Log as Logger
from Library.CommentParsing import ParseHeaderCommentSection, \
ParseGenericComment, \
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
#
# Test ParseHeaderCommentSection
diff --git a/BaseTools/Source/Python/UPT/Xml/CommonXml.py b/BaseTools/Source/Python/UPT/Xml/CommonXml.py
index e28aec5..805310d 100644
--- a/BaseTools/Source/Python/UPT/Xml/CommonXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/CommonXml.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -19,14 +19,14 @@ CommonXml
##
# Import Modules
#
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
from Library.Xml.XmlRoutines import XmlNode
from Library.Xml.XmlRoutines import XmlList
diff --git a/BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py b/BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py
index bfd8d4f..a747b02 100644
--- a/BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -13,13 +13,13 @@
#
'''
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
from Library.Xml.XmlRoutines import XmlList
from Library.Xml.XmlRoutines import CreateXmlElement
diff --git a/BaseTools/Source/Python/UPT/Xml/IniToXml.py b/BaseTools/Source/Python/UPT/Xml/IniToXml.py
index 0374710..aa6f230 100644
--- a/BaseTools/Source/Python/UPT/Xml/IniToXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/IniToXml.py
@@ -1,9 +1,9 @@
## @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
# 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 CreateXmlElement
from Library.DataType import TAB_VALUE_SPLIT
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
## log error:
#
diff --git a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
index 51ac48a..7480cb5 100644
--- a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -15,14 +15,14 @@
'''
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
from Library.Xml.XmlRoutines import XmlList
from Library.Xml.XmlRoutines import CreateXmlElement
diff --git a/BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py b/BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py
index d6ed8c5..30091c6 100644
--- a/BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -15,11 +15,11 @@
'''
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
from Library.Xml.XmlRoutines import CreateXmlElement
from Object.POM.CommonObject import IncludeObject
diff --git a/BaseTools/Source/Python/UPT/Xml/PcdXml.py b/BaseTools/Source/Python/UPT/Xml/PcdXml.py
index 4603918..c0dc654 100644
--- a/BaseTools/Source/Python/UPT/Xml/PcdXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/PcdXml.py
@@ -1,9 +1,9 @@
## @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
# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -23,13 +23,13 @@ PcdXml
from Library.Xml.XmlRoutines import XmlElement
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
from Xml.CommonXml import HelpTextXml
from Xml.CommonXml import PromptXml
--
2.6.1.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Reviewed-by: Liming Gao <liming.gao@intel.com> >-----Original Message----- >From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of >Yonghong Zhu >Sent: Friday, June 08, 2018 9:51 AM >To: edk2-devel@lists.01.org >Subject: [edk2] [Patch] 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> >--- > BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py | 4 ++-- > BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py | 6 +++--- > BaseTools/Source/Python/UPT/Library/CommentGenerating.py | 4 ++-- > BaseTools/Source/Python/UPT/Library/CommentParsing.py | 6 +++--- > BaseTools/Source/Python/UPT/Library/Misc.py | 4 ++-- > BaseTools/Source/Python/UPT/Library/ParserValidate.py | 4 ++-- > BaseTools/Source/Python/UPT/Library/Parsing.py | 14 +++++++------- > BaseTools/Source/Python/UPT/Library/StringUtils.py | 4 ++-- > BaseTools/Source/Python/UPT/Library/UniClassObject.py | 2 +- > .../Source/Python/UPT/Object/Parser/InfDefineObject.py | 4 ++-- > BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py | 6 +++--- > BaseTools/Source/Python/UPT/Parser/DecParser.py | 10 +++++----- > BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py | 4 ++-- > BaseTools/Source/Python/UPT/Parser/InfParser.py | 6 +++--- > BaseTools/Source/Python/UPT/Parser/InfParserMisc.py | 6 +++--- > BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py | 4 ++-- > BaseTools/Source/Python/UPT/Parser/InfSectionParser.py | 4 ++-- > BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py | 10 >+++++----- > .../Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py | 4 ++-- > .../Python/UPT/UnitTest/CommentGeneratingUnitTest.py | 4 ++-- > .../Source/Python/UPT/UnitTest/CommentParsingUnitTest.py | 4 ++-- > BaseTools/Source/Python/UPT/Xml/CommonXml.py | 10 +++++----- > BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py | 8 ++++---- > BaseTools/Source/Python/UPT/Xml/IniToXml.py | 4 ++-- > BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py | 10 >+++++----- > BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py | 4 ++-- > BaseTools/Source/Python/UPT/Xml/PcdXml.py | 8 ++++---- > 27 files changed, 79 insertions(+), 79 deletions(-) > >diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py >b/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py >index d39c182..9397359 100644 >--- a/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py >+++ b/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py >@@ -1,10 +1,10 @@ > ## @file GenDecFile.py > # > # 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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -63,11 +63,11 @@ from Library.DataType import TAB_PCD_ERROR > from Library.DataType import TAB_SECTION_START > 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): > # > # generate [Pcd] section > # <TokenSpcCName>.<TokenCName>|<Value>|<DatumType>|<Token> >diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py >b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py >index 9373a14..bfd422b 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 - 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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -18,11 +18,11 @@ GenInf > import os > 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 > from Library.Misc import SaveFileOnChange > from Library.Misc import IsAllModuleList >@@ -39,11 +39,11 @@ from Logger import StringTable as ST > from Logger import ToolError > 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 > # > # Transfer all contents of a standard Module Object to an Inf file >diff --git a/BaseTools/Source/Python/UPT/Library/CommentGenerating.py >b/BaseTools/Source/Python/UPT/Library/CommentGenerating.py >index 9c6e3aa..ab1725f 100644 >--- a/BaseTools/Source/Python/UPT/Library/CommentGenerating.py >+++ b/BaseTools/Source/Python/UPT/Library/CommentGenerating.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -17,11 +17,11 @@ 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 > from Library.DataType import ITEM_UNDEFINED > from Library.DataType import TAB_HEADER_COMMENT >diff --git a/BaseTools/Source/Python/UPT/Library/CommentParsing.py >b/BaseTools/Source/Python/UPT/Library/CommentParsing.py >index 38f7012..4713614 100644 >--- a/BaseTools/Source/Python/UPT/Library/CommentParsing.py >+++ b/BaseTools/Source/Python/UPT/Library/CommentParsing.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -19,12 +19,12 @@ CommentParsing > ## > # Import Modules > # > 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 > from Library.DataType import HEADER_COMMENT_ABSTRACT > from Library.DataType import HEADER_COMMENT_COPYRIGHT >diff --git a/BaseTools/Source/Python/UPT/Library/Misc.py >b/BaseTools/Source/Python/UPT/Library/Misc.py >index 719445b..e16d309 100644 >--- a/BaseTools/Source/Python/UPT/Library/Misc.py >+++ b/BaseTools/Source/Python/UPT/Library/Misc.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -43,11 +43,11 @@ from Library.DataType import END_OF_LINE > from Library.DataType import TAB_SPLIT > 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 > from Core.FileHook import __FileHookOpen__ > from Common.MultipleWorkspace import MultipleWorkspace as mws >diff --git a/BaseTools/Source/Python/UPT/Library/ParserValidate.py >b/BaseTools/Source/Python/UPT/Library/ParserValidate.py >index 2def90a..3f8ca9d 100644 >--- a/BaseTools/Source/Python/UPT/Library/ParserValidate.py >+++ b/BaseTools/Source/Python/UPT/Library/ParserValidate.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -22,11 +22,11 @@ import platform > > 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 > > ## __HexDigit() method >diff --git a/BaseTools/Source/Python/UPT/Library/Parsing.py >b/BaseTools/Source/Python/UPT/Library/Parsing.py >index 791e064..22030e7 100644 >--- a/BaseTools/Source/Python/UPT/Library/Parsing.py >+++ b/BaseTools/Source/Python/UPT/Library/Parsing.py >@@ -1,10 +1,10 @@ > ## @file > # 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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -21,16 +21,16 @@ Parsing > # Import Modules > # > 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 > from Logger.ToolError import FORMAT_INVALID > >diff --git a/BaseTools/Source/Python/UPT/Library/StringUtils.py >b/BaseTools/Source/Python/UPT/Library/StringUtils.py >index b79891e..a7a7b86 100644 >--- a/BaseTools/Source/Python/UPT/Library/StringUtils.py >+++ b/BaseTools/Source/Python/UPT/Library/StringUtils.py >@@ -1,21 +1,21 @@ > ## @file > # 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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php > # > # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" >BASIS, > # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER >EXPRESS OR IMPLIED. > # > ''' >-String >+StringUtils > ''' > ## > # Import Modules > # > import re >diff --git a/BaseTools/Source/Python/UPT/Library/UniClassObject.py >b/BaseTools/Source/Python/UPT/Library/UniClassObject.py >index 66eefee..7dcf0cf 100644 >--- a/BaseTools/Source/Python/UPT/Library/UniClassObject.py >+++ b/BaseTools/Source/Python/UPT/Library/UniClassObject.py >@@ -21,11 +21,11 @@ Collect all defined strings in multiple uni files > import os, codecs, re > 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 > from Library.ParserValidate import CheckUTF16FileHeader > >diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py >b/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py >index bbc797f..3995546 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 - 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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -21,11 +21,11 @@ import re > > 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 > from Library.Misc import ValidateUNIFilePath > from Library.ExpressionValidate import IsValidFeatureFlagExp >diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py >b/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py >index d2712a9..62c1e84 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 - 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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -29,12 +29,12 @@ 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 > 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 > > from Object.Parser.InfPackagesObject import InfPackageItem >diff --git a/BaseTools/Source/Python/UPT/Parser/DecParser.py >b/BaseTools/Source/Python/UPT/Parser/DecParser.py >index 85b8a17..7ac0dfa 100644 >--- a/BaseTools/Source/Python/UPT/Parser/DecParser.py >+++ b/BaseTools/Source/Python/UPT/Parser/DecParser.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -55,14 +55,14 @@ from Object.Parser.DecObject import >DecUserExtensionObject > from Object.Parser.DecObject import DecUserExtensionItemObject > 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 > > ## > # _DecBase class for parsing > # >diff --git a/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py >b/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py >index 4eed04c..760f28a 100644 >--- a/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py >+++ b/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -21,11 +21,11 @@ import re > from Library import GlobalData > 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 > from Library.ParserValidate import IsValidPath > from Library.Parsing import MacroParser >diff --git a/BaseTools/Source/Python/UPT/Parser/InfParser.py >b/BaseTools/Source/Python/UPT/Parser/InfParser.py >index 7bea49e..e6048a1 100644 >--- a/BaseTools/Source/Python/UPT/Parser/InfParser.py >+++ b/BaseTools/Source/Python/UPT/Parser/InfParser.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -21,12 +21,12 @@ InfParser > # > 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 > from Library.ParserValidate import IsValidInfMoudleTypeList > from Library.ParserValidate import IsValidArch >diff --git a/BaseTools/Source/Python/UPT/Parser/InfParserMisc.py >b/BaseTools/Source/Python/UPT/Parser/InfParserMisc.py >index 6a335e8..df32225 100644 >--- a/BaseTools/Source/Python/UPT/Parser/InfParserMisc.py >+++ b/BaseTools/Source/Python/UPT/Parser/InfParserMisc.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -23,12 +23,12 @@ 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 > > # > # Global variable >diff --git a/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py >b/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py >index a9b87fd..13535a37 100644 >--- a/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py >+++ b/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -24,11 +24,11 @@ from Logger.ToolError import FORMAT_INVALID > from Parser.InfParserMisc import InfExpandMacro > 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): > ## Section PCD related parser > # >diff --git a/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py >b/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py >index 727164c..8ba4c3f 100644 >--- a/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py >+++ b/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -19,11 +19,11 @@ InfSectionParser > # Import Modules > # > 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 > > from Library import DataType as DT > >diff --git a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py >b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py >index 165ac11..a5929e1 100644 >--- a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py >+++ b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -18,14 +18,14 @@ InfPomAlignment > # Import modules > # > 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 > from Library.Misc import GetRelativePath > from Library.Misc import PathClass >diff --git >a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py >b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py >index cca70e5..cee4251 100644 >--- a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py >+++ b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -22,11 +22,11 @@ InfPomAlignmentMisc > import Logger.Log as Logger > 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 > > > ## GenModuleHeaderUserExt >diff --git >a/BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py >b/BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py >index 42a2ba3..9c50d2d 100644 >--- >a/BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py >+++ >b/BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -26,11 +26,11 @@ from Object.POM.CommonObject import GuidObject > from Object.POM.CommonObject import ProtocolObject > 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 > from Library.DataType import ITEM_UNDEFINED > from Library.DataType import TAB_INF_FEATURE_PCD >diff --git >a/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py >b/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py >index a114ff2..4593506 100644 >--- a/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py >+++ b/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -17,11 +17,11 @@ import Logger.Log as Logger > from Library.CommentParsing import ParseHeaderCommentSection, \ > ParseGenericComment, \ > 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 > > # > # Test ParseHeaderCommentSection >diff --git a/BaseTools/Source/Python/UPT/Xml/CommonXml.py >b/BaseTools/Source/Python/UPT/Xml/CommonXml.py >index e28aec5..805310d 100644 >--- a/BaseTools/Source/Python/UPT/Xml/CommonXml.py >+++ b/BaseTools/Source/Python/UPT/Xml/CommonXml.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -19,14 +19,14 @@ CommonXml > ## > # Import Modules > # > > 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 > from Library.Xml.XmlRoutines import XmlNode > from Library.Xml.XmlRoutines import XmlList >diff --git a/BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py >b/BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py >index bfd8d4f..a747b02 100644 >--- a/BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py >+++ b/BaseTools/Source/Python/UPT/Xml/GuidProtocolPpiXml.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -13,13 +13,13 @@ > # > > ''' > 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 > from Library.Xml.XmlRoutines import XmlList > from Library.Xml.XmlRoutines import CreateXmlElement >diff --git a/BaseTools/Source/Python/UPT/Xml/IniToXml.py >b/BaseTools/Source/Python/UPT/Xml/IniToXml.py >index 0374710..aa6f230 100644 >--- a/BaseTools/Source/Python/UPT/Xml/IniToXml.py >+++ b/BaseTools/Source/Python/UPT/Xml/IniToXml.py >@@ -1,9 +1,9 @@ > ## @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 > # 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 >CreateXmlElement > from Library.DataType import TAB_VALUE_SPLIT > 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 > > ## log error: > # >diff --git a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py >b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py >index 51ac48a..7480cb5 100644 >--- a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py >+++ b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -15,14 +15,14 @@ > ''' > 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 > from Library.Xml.XmlRoutines import XmlList > from Library.Xml.XmlRoutines import CreateXmlElement >diff --git a/BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py >b/BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py >index d6ed8c5..30091c6 100644 >--- a/BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py >+++ b/BaseTools/Source/Python/UPT/Xml/PackageSurfaceAreaXml.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -15,11 +15,11 @@ > ''' > 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 > from Library.Xml.XmlRoutines import CreateXmlElement > from Object.POM.CommonObject import IncludeObject >diff --git a/BaseTools/Source/Python/UPT/Xml/PcdXml.py >b/BaseTools/Source/Python/UPT/Xml/PcdXml.py >index 4603918..c0dc654 100644 >--- a/BaseTools/Source/Python/UPT/Xml/PcdXml.py >+++ b/BaseTools/Source/Python/UPT/Xml/PcdXml.py >@@ -1,9 +1,9 @@ > ## @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 > # distribution. The full text of the license may be found at > # http://opensource.org/licenses/bsd-license.php >@@ -23,13 +23,13 @@ PcdXml > from Library.Xml.XmlRoutines import XmlElement > 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 > from Xml.CommonXml import HelpTextXml > from Xml.CommonXml import PromptXml >-- >2.6.1.windows.1 > >_______________________________________________ >edk2-devel mailing list >edk2-devel@lists.01.org >https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
© 2016 - 2024 Red Hat, Inc.