From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 818FF203B9926 for ; Sun, 20 May 2018 17:59:55 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2018 17:59:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,425,1520924400"; d="scan'208";a="43348063" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga006.jf.intel.com with ESMTP; 20 May 2018 17:59:54 -0700 Received: from fmsmsx101.amr.corp.intel.com (10.18.124.199) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 20 May 2018 17:59:54 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx101.amr.corp.intel.com (10.18.124.199) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 20 May 2018 17:59:53 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.240]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.6]) with mapi id 14.03.0319.002; Mon, 21 May 2018 08:59:51 +0800 From: "Gao, Liming" To: "Marvin.Haeuser@outlook.com" , "edk2-devel@lists.01.org" CC: "Zhu, Yonghong" , "Gao, Liming" Thread-Topic: [PATCH] BaseTools: Rename String to StringUtils. Thread-Index: AQHT718xL9LFoyYa8kS09y4lQtmhVKQ5Xsaw Date: Mon, 21 May 2018 00:59:50 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E22C7F3@SHSMSX104.ccr.corp.intel.com> References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.200.100 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] BaseTools: Rename String to StringUtils. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 May 2018 00:59:55 -0000 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Marvin: Thanks. This is a good enhancement. I will verify it in my platform and l= et you know the result.=20 Thanks Liming > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ma= rvin H?user > Sent: Saturday, May 19, 2018 6:50 PM > To: edk2-devel@lists.01.org > Cc: Gao, Liming > Subject: [edk2] [PATCH] BaseTools: Rename String to StringUtils. >=20 > For case-insensitive file systems, edk2 String.py collides with the > Python string.py, which results in build errors. This,for example, > applies to building via the Windows Subsystem for Linux from a > DriveFS file system. This patch renames String to StringUtils to > prevent conflicts for case-insensitive file systems. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Marvin Haeuser > --- > BaseTools/Source/Python/AutoGen/AutoGen.py | 2 +- > BaseTools/Source/Python/AutoGen/BuildEngine.py | 2 +- > BaseTools/Source/Python/AutoGen/GenC.py | 2 +- > BaseTools/Source/Python/AutoGen/GenMake.py | 2 +- > BaseTools/Source/Python/AutoGen/GenPcdDb.py | 2 +- > BaseTools/Source/Python/AutoGen/IdfClassObject.py | 2 +- > BaseTools/Source/Python/AutoGen/UniClassObject.py | 2 +- > BaseTools/Source/Python/Common/Database.py | 2 +- > BaseTools/Source/Python/Common/Parsing.py | 2 +- > BaseTools/Source/Python/Common/{String.py =3D> StringUtils.py} | 0 > BaseTools/Source/Python/Common/ToolDefClassObject.py | 2 +- > BaseTools/Source/Python/Ecc/Configuration.py | 2 +- > BaseTools/Source/Python/Ecc/Ecc.py | 2 +- > BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py | 2 +- > BaseTools/Source/Python/Eot/Eot.py | 2 +- > BaseTools/Source/Python/Eot/InfParserLite.py | 2 +- > BaseTools/Source/Python/Eot/Parser.py | 4 ++= -- > BaseTools/Source/Python/GenFds/AprioriSection.py | 2 +- > BaseTools/Source/Python/GenFds/FdfParser.py | 4 ++= -- > BaseTools/Source/Python/GenFds/FfsInfStatement.py | 2 +- > BaseTools/Source/Python/GenFds/GenFds.py | 2 +- > BaseTools/Source/Python/GenFds/OptRomInfStatement.py | 2 +- > BaseTools/Source/Python/Makefile | 4 ++= -- > BaseTools/Source/Python/Table/TableDataModel.py | 2 +- > BaseTools/Source/Python/Table/TableDec.py | 2 +- > BaseTools/Source/Python/Table/TableDsc.py | 2 +- > BaseTools/Source/Python/Table/TableEotReport.py | 2 +- > BaseTools/Source/Python/Table/TableFdf.py | 2 +- > BaseTools/Source/Python/Table/TableFile.py | 2 +- > BaseTools/Source/Python/Table/TableFunction.py | 2 +- > BaseTools/Source/Python/Table/TableIdentifier.py | 2 +- > BaseTools/Source/Python/Table/TableInf.py | 2 +- > BaseTools/Source/Python/Table/TablePcd.py | 2 +- > BaseTools/Source/Python/Table/TableQuery.py | 2 +- > BaseTools/Source/Python/Table/TableReport.py | 2 +- > BaseTools/Source/Python/UPT/Library/{String.py =3D> StringUtils.py} | 0 > BaseTools/Source/Python/Workspace/DecBuildData.py | 2 +- > BaseTools/Source/Python/Workspace/DscBuildData.py | 2 +- > BaseTools/Source/Python/Workspace/InfBuildData.py | 2 +- > BaseTools/Source/Python/Workspace/MetaFileParser.py | 2 +- > BaseTools/Source/Python/Workspace/WorkspaceDatabase.py | 2 +- > BaseTools/Source/Python/build/BuildReport.py | 2 +- > 42 files changed, 43 insertions(+), 43 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Sourc= e/Python/AutoGen/AutoGen.py > index 1e6511cdb5d2..4304967aee42 100644 > --- a/BaseTools/Source/Python/AutoGen/AutoGen.py > +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py > @@ -33,7 +33,7 @@ from Common.LongFilePathSupport import CopyLongFilePath > from Common.BuildToolError import * > from Common.DataType import * > from Common.Misc import * > -from Common.String import * > +from Common.StringUtils import * > import Common.GlobalData as GlobalData > from GenFds.FdfParser import * > from CommonDataClass.CommonClass import SkuInfoClass > diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/S= ource/Python/AutoGen/BuildEngine.py > index dd6301b01fce..ad1919442e6e 100644 > --- a/BaseTools/Source/Python/AutoGen/BuildEngine.py > +++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py > @@ -23,7 +23,7 @@ from Common.LongFilePathSupport import OpenLongFilePath= as open > from Common.GlobalData import * > from Common.BuildToolError import * > from Common.Misc import tdict, PathClass > -from Common.String import NormPath > +from Common.StringUtils import NormPath > from Common.DataType import * >=20 > import Common.EdkLogger as EdkLogger > diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/P= ython/AutoGen/GenC.py > index 40a343ca1057..1be27d2b89e0 100644 > --- a/BaseTools/Source/Python/AutoGen/GenC.py > +++ b/BaseTools/Source/Python/AutoGen/GenC.py > @@ -21,7 +21,7 @@ from Common import EdkLogger > from Common.BuildToolError import * > from Common.DataType import * > from Common.Misc import * > -from Common.String import StringToArray > +from Common.StringUtils import StringToArray > from StrGather import * > from GenPcdDb import CreatePcdDatabaseCode > from IdfClassObject import * > diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Sourc= e/Python/AutoGen/GenMake.py > index a37350742240..6e83b3d73e61 100644 > --- a/BaseTools/Source/Python/AutoGen/GenMake.py > +++ b/BaseTools/Source/Python/AutoGen/GenMake.py > @@ -22,7 +22,7 @@ from Common.LongFilePathSupport import OpenLongFilePath= as open > from Common.MultipleWorkspace import MultipleWorkspace as mws > from Common.BuildToolError import * > from Common.Misc import * > -from Common.String import * > +from Common.StringUtils import * > from BuildEngine import * > import Common.GlobalData as GlobalData > from collections import OrderedDict > diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Sour= ce/Python/AutoGen/GenPcdDb.py > index d2d42fe9d08e..2e05b77e14c2 100644 > --- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py > +++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py > @@ -12,7 +12,7 @@ > # > from StringIO import StringIO > from Common.Misc import * > -from Common.String import StringToArray > +from Common.StringUtils import StringToArray > from struct import pack > from ValidCheckingInfoObject import VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER > from ValidCheckingInfoObject import VAR_CHECK_PCD_VARIABLE_TAB > diff --git a/BaseTools/Source/Python/AutoGen/IdfClassObject.py b/BaseTool= s/Source/Python/AutoGen/IdfClassObject.py > index 769790d965b5..e5b933c2036f 100644 > --- a/BaseTools/Source/Python/AutoGen/IdfClassObject.py > +++ b/BaseTools/Source/Python/AutoGen/IdfClassObject.py > @@ -16,7 +16,7 @@ > import Common.EdkLogger as EdkLogger > import StringIO > from Common.BuildToolError import * > -from Common.String import GetLineNo > +from Common.StringUtils import GetLineNo > from Common.Misc import PathClass > from Common.LongFilePathSupport import LongFilePath > import re > diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTool= s/Source/Python/AutoGen/UniClassObject.py > index 54b6fb22a08a..5a3c2547783b 100644 > --- a/BaseTools/Source/Python/AutoGen/UniClassObject.py > +++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py > @@ -21,7 +21,7 @@ import distutils.util > import Common.EdkLogger as EdkLogger > import StringIO > from Common.BuildToolError import * > -from Common.String import GetLineNo > +from Common.StringUtils import GetLineNo > from Common.Misc import PathClass > from Common.LongFilePathSupport import LongFilePath > from Common.GlobalData import * > diff --git a/BaseTools/Source/Python/Common/Database.py b/BaseTools/Sourc= e/Python/Common/Database.py > index a81a44731f03..d3340f5a9036 100644 > --- a/BaseTools/Source/Python/Common/Database.py > +++ b/BaseTools/Source/Python/Common/Database.py > @@ -19,7 +19,7 @@ import Common.LongFilePathOs as os >=20 > import EdkLogger as EdkLogger > from CommonDataClass.DataClass import * > -from String import * > +from StringUtils import * > from DataType import * >=20 > from Table.TableDataModel import TableDataModel > diff --git a/BaseTools/Source/Python/Common/Parsing.py b/BaseTools/Source= /Python/Common/Parsing.py > index 453c2039e3d9..527852a50c09 100644 > --- a/BaseTools/Source/Python/Common/Parsing.py > +++ b/BaseTools/Source/Python/Common/Parsing.py > @@ -14,7 +14,7 @@ > ## > # Import Modules > # > -from String import * > +from StringUtils import * > from CommonDataClass.DataClass import * > from DataType import * >=20 > diff --git a/BaseTools/Source/Python/Common/String.py b/BaseTools/Source/= Python/Common/StringUtils.py > similarity index 100% > rename from BaseTools/Source/Python/Common/String.py > rename to BaseTools/Source/Python/Common/StringUtils.py > diff --git a/BaseTools/Source/Python/Common/ToolDefClassObject.py b/BaseT= ools/Source/Python/Common/ToolDefClassObject.py > index 83359586b994..dd985ab30359 100644 > --- a/BaseTools/Source/Python/Common/ToolDefClassObject.py > +++ b/BaseTools/Source/Python/Common/ToolDefClassObject.py > @@ -22,7 +22,7 @@ from BuildToolError import * > from TargetTxtClassObject import * > from Common.LongFilePathSupport import OpenLongFilePath as open > from Common.Misc import PathClass > -from Common.String import NormPath > +from Common.StringUtils import NormPath > import Common.GlobalData as GlobalData > from Common import GlobalData > from Common.MultipleWorkspace import MultipleWorkspace as mws > diff --git a/BaseTools/Source/Python/Ecc/Configuration.py b/BaseTools/Sou= rce/Python/Ecc/Configuration.py > index fee7ecb9703d..217b60f4f319 100644 > --- a/BaseTools/Source/Python/Ecc/Configuration.py > +++ b/BaseTools/Source/Python/Ecc/Configuration.py > @@ -17,7 +17,7 @@ > import Common.LongFilePathOs as os > import Common.EdkLogger as EdkLogger > from Common.DataType import * > -from Common.String import * > +from Common.StringUtils import * > from Common.LongFilePathSupport import OpenLongFilePath as open >=20 > _ConfigFileToInternalTranslation =3D { > diff --git a/BaseTools/Source/Python/Ecc/Ecc.py b/BaseTools/Source/Python= /Ecc/Ecc.py > index 60dfc00260f1..e78d70372e36 100644 > --- a/BaseTools/Source/Python/Ecc/Ecc.py > +++ b/BaseTools/Source/Python/Ecc/Ecc.py > @@ -24,7 +24,7 @@ from Configuration import Configuration > from Check import Check > import Common.GlobalData as GlobalData >=20 > -from Common.String import NormPath > +from Common.StringUtils import NormPath > from Common.BuildVersion import gBUILD_VERSION > from Common import BuildToolError > from Common.Misc import PathClass > diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser= .py > b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py > index 4d61cd1cea91..3749f6a2699e 100644 > --- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py > +++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py > @@ -26,7 +26,7 @@ import EccToolError >=20 > from CommonDataClass.DataClass import * > from Common.DataType import * > -from Common.String import * > +from Common.StringUtils import * > from Common.Misc import GuidStructureStringToGuidString, CheckPcdDatum, = PathClass, AnalyzePcdData > from Common.Expression import * > from CommonDataClass.Exceptions import * > diff --git a/BaseTools/Source/Python/Eot/Eot.py b/BaseTools/Source/Python= /Eot/Eot.py > index fcde8fd3e22f..30a3baa4910a 100644 > --- a/BaseTools/Source/Python/Eot/Eot.py > +++ b/BaseTools/Source/Python/Eot/Eot.py > @@ -18,7 +18,7 @@ import Common.LongFilePathOs as os, time, glob > import Common.EdkLogger as EdkLogger > import EotGlobalData > from optparse import OptionParser > -from Common.String import NormPath > +from Common.StringUtils import NormPath > from Common import BuildToolError > from Common.Misc import GuidStructureStringToGuidString > from InfParserLite import * > diff --git a/BaseTools/Source/Python/Eot/InfParserLite.py b/BaseTools/Sou= rce/Python/Eot/InfParserLite.py > index 8867bb5dc23a..584a95d6f3e4 100644 > --- a/BaseTools/Source/Python/Eot/InfParserLite.py > +++ b/BaseTools/Source/Python/Eot/InfParserLite.py > @@ -19,7 +19,7 @@ import Common.EdkLogger as EdkLogger > from Common.DataType import * > from CommonDataClass.DataClass import * > from Common.Identification import * > -from Common.String import * > +from Common.StringUtils import * > from Parser import * > import Database >=20 > diff --git a/BaseTools/Source/Python/Eot/Parser.py b/BaseTools/Source/Pyt= hon/Eot/Parser.py > index 14c287588a01..ff88e957ad0d 100644 > --- a/BaseTools/Source/Python/Eot/Parser.py > +++ b/BaseTools/Source/Python/Eot/Parser.py > @@ -19,9 +19,9 @@ import Common.LongFilePathOs as os, re > import Common.EdkLogger as EdkLogger > from Common.DataType import * > from CommonDataClass.DataClass import * > -from Common.String import CleanString, GetSplitValueList, ReplaceMacro > +from Common.StringUtils import CleanString, GetSplitValueList, ReplaceMa= cro > import EotGlobalData > -from Common.String import GetSplitList > +from Common.StringUtils import GetSplitList > from Common.LongFilePathSupport import OpenLongFilePath as open >=20 > ## PreProcess() method > diff --git a/BaseTools/Source/Python/GenFds/AprioriSection.py b/BaseTools= /Source/Python/GenFds/AprioriSection.py > index 7cf792b5b251..6b81b42620d7 100644 > --- a/BaseTools/Source/Python/GenFds/AprioriSection.py > +++ b/BaseTools/Source/Python/GenFds/AprioriSection.py > @@ -21,7 +21,7 @@ import StringIO > import FfsFileStatement > from GenFdsGlobalVariable import GenFdsGlobalVariable > from CommonDataClass.FdfClass import AprioriSectionClassObject > -from Common.String import * > +from Common.StringUtils import * > from Common.Misc import SaveFileOnChange,PathClass > from Common import EdkLogger > from Common.BuildToolError import * > diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Sour= ce/Python/GenFds/FdfParser.py > index 8a9296c49d1d..bb801c02e1cb 100644 > --- a/BaseTools/Source/Python/GenFds/FdfParser.py > +++ b/BaseTools/Source/Python/GenFds/FdfParser.py > @@ -48,12 +48,12 @@ from GenFdsGlobalVariable import GenFdsGlobalVariable > from Common.BuildToolError import * > from Common import EdkLogger > from Common.Misc import PathClass > -from Common.String import NormPath > +from Common.StringUtils import NormPath > import Common.GlobalData as GlobalData > from Common.Expression import * > from Common import GlobalData > from Common.DataType import * > -from Common.String import ReplaceMacro > +from Common.StringUtils import ReplaceMacro > import uuid > from Common.Misc import tdict > from Common.MultipleWorkspace import MultipleWorkspace as mws > diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTool= s/Source/Python/GenFds/FfsInfStatement.py > index c332eee6079d..b26821b29052 100644 > --- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py > +++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py > @@ -29,7 +29,7 @@ import RuleSimpleFile > import RuleComplexFile > from CommonDataClass.FdfClass import FfsInfStatementClassObject > from Common.MultipleWorkspace import MultipleWorkspace as mws > -from Common.String import * > +from Common.StringUtils import * > from Common.Misc import PathClass > from Common.Misc import GuidStructureByteArrayToGuidString > from Common.Misc import ProcessDuplicatedInf > diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/= Python/GenFds/GenFds.py > index f0b51e25dfa2..339b99867369 100644 > --- a/BaseTools/Source/Python/GenFds/GenFds.py > +++ b/BaseTools/Source/Python/GenFds/GenFds.py > @@ -32,7 +32,7 @@ import Common.ToolDefClassObject as ToolDefClassObject > from Common.DataType import * > import Common.GlobalData as GlobalData > from Common import EdkLogger > -from Common.String import * > +from Common.StringUtils import * > from Common.Misc import DirCache, PathClass > from Common.Misc import SaveFileOnChange > from Common.Misc import ClearDuplicatedInf > diff --git a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py b/BaseT= ools/Source/Python/GenFds/OptRomInfStatement.py > index a865ac4436d5..79891b3b82a4 100644 > --- a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py > +++ b/BaseTools/Source/Python/GenFds/OptRomInfStatement.py > @@ -22,7 +22,7 @@ import OptionRom > import Common.GlobalData as GlobalData >=20 > from Common.DataType import * > -from Common.String import * > +from Common.StringUtils import * > from FfsInfStatement import FfsInfStatement > from GenFdsGlobalVariable import GenFdsGlobalVariable >=20 > diff --git a/BaseTools/Source/Python/Makefile b/BaseTools/Source/Python/M= akefile > index 8466f6ebab33..d78b12d5050d 100644 > --- a/BaseTools/Source/Python/Makefile > +++ b/BaseTools/Source/Python/Makefile > @@ -46,7 +46,7 @@ COMMON_PYTHON=3D$(BASE_TOOLS_PATH)\Source\Python\Common= \BuildToolError.py \ > $(BASE_TOOLS_PATH)\Source\Python\Common\LongFilePathSuppor= t.py \ > $(BASE_TOOLS_PATH)\Source\Python\Common\Misc.py \ > $(BASE_TOOLS_PATH)\Source\Python\Common\Parsing.py \ > - $(BASE_TOOLS_PATH)\Source\Python\Common\String.py \ > + $(BASE_TOOLS_PATH)\Source\Python\Common\StringUtils.py \ > $(BASE_TOOLS_PATH)\Source\Python\Common\TargetTxtClassObje= ct.py \ > $(BASE_TOOLS_PATH)\Source\Python\Common\ToolDefClassObject= .py \ > $(BASE_TOOLS_PATH)\Source\Python\Common\VpdInfoFile.py \ > @@ -167,7 +167,7 @@ CMD_UPT=3D$(BASE_TOOLS_PATH)\Source\Python\UPT\Core\D= ependencyRules.py \ > $(BASE_TOOLS_PATH)\Source\Python\UPT\Library\Misc.py \ > $(BASE_TOOLS_PATH)\Source\Python\UPT\Library\ParserValidate.py \ > $(BASE_TOOLS_PATH)\Source\Python\UPT\Library\Parsing.py \ > - $(BASE_TOOLS_PATH)\Source\Python\UPT\Library\String.py \ > + $(BASE_TOOLS_PATH)\Source\Python\UPT\Library\StringUtils.py \ > $(BASE_TOOLS_PATH)\Source\Python\UPT\Library\UniClassObject.py \ > $(BASE_TOOLS_PATH)\Source\Python\UPT\Library\Xml\XmlRoutines.py \ > $(BASE_TOOLS_PATH)\Source\Python\UPT\Logger\Log.py \ > diff --git a/BaseTools/Source/Python/Table/TableDataModel.py b/BaseTools/= Source/Python/Table/TableDataModel.py > index 9c3d7bd9345f..2c37592fc67c 100644 > --- a/BaseTools/Source/Python/Table/TableDataModel.py > +++ b/BaseTools/Source/Python/Table/TableDataModel.py > @@ -17,7 +17,7 @@ > import Common.EdkLogger as EdkLogger > import CommonDataClass.DataClass as DataClass > from Table import Table > -from Common.String import ConvertToSqlString > +from Common.StringUtils import ConvertToSqlString >=20 > ## TableDataModel > # > diff --git a/BaseTools/Source/Python/Table/TableDec.py b/BaseTools/Source= /Python/Table/TableDec.py > index 6b7d22c9384c..97139c58d893 100644 > --- a/BaseTools/Source/Python/Table/TableDec.py > +++ b/BaseTools/Source/Python/Table/TableDec.py > @@ -17,7 +17,7 @@ > import Common.EdkLogger as EdkLogger > import CommonDataClass.DataClass as DataClass > from Table import Table > -from Common.String import ConvertToSqlString > +from Common.StringUtils import ConvertToSqlString >=20 > ## TableDec > # > diff --git a/BaseTools/Source/Python/Table/TableDsc.py b/BaseTools/Source= /Python/Table/TableDsc.py > index 69477d544d8e..4ac54933aa3b 100644 > --- a/BaseTools/Source/Python/Table/TableDsc.py > +++ b/BaseTools/Source/Python/Table/TableDsc.py > @@ -17,7 +17,7 @@ > import Common.EdkLogger as EdkLogger > import CommonDataClass.DataClass as DataClass > from Table import Table > -from Common.String import ConvertToSqlString > +from Common.StringUtils import ConvertToSqlString >=20 > ## TableDsc > # > diff --git a/BaseTools/Source/Python/Table/TableEotReport.py b/BaseTools/= Source/Python/Table/TableEotReport.py > index 740105c8f99d..bccf25ca45d5 100644 > --- a/BaseTools/Source/Python/Table/TableEotReport.py > +++ b/BaseTools/Source/Python/Table/TableEotReport.py > @@ -17,7 +17,7 @@ > import Common.EdkLogger as EdkLogger > import Common.LongFilePathOs as os, time > from Table import Table > -from Common.String import ConvertToSqlString2 > +from Common.StringUtils import ConvertToSqlString2 > import Eot.EotToolError as EotToolError > import Eot.EotGlobalData as EotGlobalData >=20 > diff --git a/BaseTools/Source/Python/Table/TableFdf.py b/BaseTools/Source= /Python/Table/TableFdf.py > index 927b5d1a3be6..eea8e9404d55 100644 > --- a/BaseTools/Source/Python/Table/TableFdf.py > +++ b/BaseTools/Source/Python/Table/TableFdf.py > @@ -17,7 +17,7 @@ > import Common.EdkLogger as EdkLogger > import CommonDataClass.DataClass as DataClass > from Table import Table > -from Common.String import ConvertToSqlString > +from Common.StringUtils import ConvertToSqlString >=20 > ## TableFdf > # > diff --git a/BaseTools/Source/Python/Table/TableFile.py b/BaseTools/Sourc= e/Python/Table/TableFile.py > index caf749e9d3c5..ac762ea7fcc0 100644 > --- a/BaseTools/Source/Python/Table/TableFile.py > +++ b/BaseTools/Source/Python/Table/TableFile.py > @@ -16,7 +16,7 @@ > # > import Common.EdkLogger as EdkLogger > from Table import Table > -from Common.String import ConvertToSqlString > +from Common.StringUtils import ConvertToSqlString > import Common.LongFilePathOs as os > from CommonDataClass.DataClass import FileClass >=20 > diff --git a/BaseTools/Source/Python/Table/TableFunction.py b/BaseTools/S= ource/Python/Table/TableFunction.py > index 3d7c2d0ea5a0..3d40bd61f695 100644 > --- a/BaseTools/Source/Python/Table/TableFunction.py > +++ b/BaseTools/Source/Python/Table/TableFunction.py > @@ -16,7 +16,7 @@ > # > import Common.EdkLogger as EdkLogger > from Table import Table > -from Common.String import ConvertToSqlString > +from Common.StringUtils import ConvertToSqlString >=20 > ## TableFunction > # > diff --git a/BaseTools/Source/Python/Table/TableIdentifier.py b/BaseTools= /Source/Python/Table/TableIdentifier.py > index bcd6d6e1c152..0ec8b3c162ce 100644 > --- a/BaseTools/Source/Python/Table/TableIdentifier.py > +++ b/BaseTools/Source/Python/Table/TableIdentifier.py > @@ -15,7 +15,7 @@ > # Import Modules > # > import Common.EdkLogger as EdkLogger > -from Common.String import ConvertToSqlString > +from Common.StringUtils import ConvertToSqlString > from Table import Table >=20 > ## TableIdentifier > diff --git a/BaseTools/Source/Python/Table/TableInf.py b/BaseTools/Source= /Python/Table/TableInf.py > index b6e300b150c1..478b77776e35 100644 > --- a/BaseTools/Source/Python/Table/TableInf.py > +++ b/BaseTools/Source/Python/Table/TableInf.py > @@ -17,7 +17,7 @@ > import Common.EdkLogger as EdkLogger > import CommonDataClass.DataClass as DataClass > from Table import Table > -from Common.String import ConvertToSqlString > +from Common.StringUtils import ConvertToSqlString >=20 > ## TableInf > # > diff --git a/BaseTools/Source/Python/Table/TablePcd.py b/BaseTools/Source= /Python/Table/TablePcd.py > index 19623f98f42c..ca1c0f0c8ab2 100644 > --- a/BaseTools/Source/Python/Table/TablePcd.py > +++ b/BaseTools/Source/Python/Table/TablePcd.py > @@ -16,7 +16,7 @@ > # > import Common.EdkLogger as EdkLogger > from Table import Table > -from Common.String import ConvertToSqlString > +from Common.StringUtils import ConvertToSqlString >=20 > ## TablePcd > # > diff --git a/BaseTools/Source/Python/Table/TableQuery.py b/BaseTools/Sour= ce/Python/Table/TableQuery.py > index e1d2537394b2..f377b10561dc 100644 > --- a/BaseTools/Source/Python/Table/TableQuery.py > +++ b/BaseTools/Source/Python/Table/TableQuery.py > @@ -15,7 +15,7 @@ > # Import Modules > # > import Common.EdkLogger as EdkLogger > -from Common.String import ConvertToSqlString > +from Common.StringUtils import ConvertToSqlString > from Table import Table >=20 > ## TableQuery > diff --git a/BaseTools/Source/Python/Table/TableReport.py b/BaseTools/Sou= rce/Python/Table/TableReport.py > index 4af0e98d86b4..9ce1d0aa2518 100644 > --- a/BaseTools/Source/Python/Table/TableReport.py > +++ b/BaseTools/Source/Python/Table/TableReport.py > @@ -17,7 +17,7 @@ > import Common.EdkLogger as EdkLogger > import Common.LongFilePathOs as os, time > from Table import Table > -from Common.String import ConvertToSqlString2 > +from Common.StringUtils import ConvertToSqlString2 > import EccToolError as EccToolError > import EccGlobalData as EccGlobalData > from Common.LongFilePathSupport import OpenLongFilePath as open > diff --git a/BaseTools/Source/Python/UPT/Library/String.py b/BaseTools/So= urce/Python/UPT/Library/StringUtils.py > similarity index 100% > rename from BaseTools/Source/Python/UPT/Library/String.py > rename to BaseTools/Source/Python/UPT/Library/StringUtils.py > diff --git a/BaseTools/Source/Python/Workspace/DecBuildData.py b/BaseTool= s/Source/Python/Workspace/DecBuildData.py > index 1fbd095f743c..99257d08147b 100644 > --- a/BaseTools/Source/Python/Workspace/DecBuildData.py > +++ b/BaseTools/Source/Python/Workspace/DecBuildData.py > @@ -11,7 +11,7 @@ > # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR I= MPLIED. > # > -from Common.String import * > +from Common.StringUtils import * > from Common.DataType import * > from Common.Misc import * > from types import * > diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTool= s/Source/Python/Workspace/DscBuildData.py > index 8476543c5352..a1205e4098f8 100644 > --- a/BaseTools/Source/Python/Workspace/DscBuildData.py > +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py > @@ -17,7 +17,7 @@ > # This class is used to retrieve information stored in database and con= vert them > # into PlatformBuildClassObject form for easier use for AutoGen. > # > -from Common.String import * > +from Common.StringUtils import * > from Common.DataType import * > from Common.Misc import * > from types import * > diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTool= s/Source/Python/Workspace/InfBuildData.py > index bd1c84154123..836140759f21 100644 > --- a/BaseTools/Source/Python/Workspace/InfBuildData.py > +++ b/BaseTools/Source/Python/Workspace/InfBuildData.py > @@ -12,7 +12,7 @@ > # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR I= MPLIED. > # >=20 > -from Common.String import * > +from Common.StringUtils import * > from Common.DataType import * > from Common.Misc import * > from types import * > diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTo= ols/Source/Python/Workspace/MetaFileParser.py > index 36843643ed13..8ab1dd23a096 100644 > --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py > +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py > @@ -26,7 +26,7 @@ import Common.GlobalData as GlobalData >=20 > from CommonDataClass.DataClass import * > from Common.DataType import * > -from Common.String import * > +from Common.StringUtils import * > from Common.Misc import GuidStructureStringToGuidString, CheckPcdDatum, = PathClass, AnalyzePcdData, AnalyzeDscPcd, > AnalyzePcdExpression, ParseFieldValue > from Common.Expression import * > from CommonDataClass.Exceptions import * > diff --git a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py > b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py > index 14dcb1ae8136..9e055fcfc46b 100644 > --- a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py > +++ b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py > @@ -16,7 +16,7 @@ > # Import Modules > # > import sqlite3 > -from Common.String import * > +from Common.StringUtils import * > from Common.DataType import * > from Common.Misc import * > from types import * > diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Sou= rce/Python/build/BuildReport.py > index cf45ef173498..3c495a6b1b31 100644 > --- a/BaseTools/Source/Python/build/BuildReport.py > +++ b/BaseTools/Source/Python/build/BuildReport.py > @@ -42,7 +42,7 @@ from Common.MultipleWorkspace import MultipleWorkspace = as mws > import Common.GlobalData as GlobalData > from AutoGen.AutoGen import ModuleAutoGen > from Common.Misc import PathClass > -from Common.String import NormPath > +from Common.StringUtils import NormPath > from Common.DataType import * > import collections > from Common.Expression import * > -- > 2.17.0.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel