From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=40.92.64.54; helo=eur01-db5-obe.outbound.protection.outlook.com; envelope-from=marvin.haeuser@outlook.com; receiver=edk2-devel@lists.01.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064054.outbound.protection.outlook.com [40.92.64.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 284E8203B992C for ; Sat, 19 May 2018 03:50:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=L0iCL+GCoxlL4VlnRdY/q0q2taoura7sKW33Wuc4re8=; b=i0hBoqv1Jx4liRAEy37VLBMQBQWzyyZ7qQVqFOv6Q4od9RtLWSqi5oc2F2VhH5z92FuZi2hvdPtlDfXy0F6vuPbLQq0b6fj1KC/Wr4X2/LwQsF9javHjixgOnmrbDAaAaURyzFezHLKP5jiK4NbM7wOG3+/jKLqNnEjFPq7WMheFwIxg6dbvBbK9s4s8d/8eQDGm2zE+Su0+AmU1Hq23Pcx2+wrqkbmub4gcyU9zUE3ruMNmYIK/b7kVblkm7+bXAvXXtbXKGWaFH334o2GUu4e0F6b6UWUgHbucTXI1gCLPIk1UkZ/Xb8/3qwj/z3Po6MmrDHQPAA2cXgP5L6Qtmg== Received: from VE1EUR01FT028.eop-EUR01.prod.protection.outlook.com (10.152.2.60) by VE1EUR01HT185.eop-EUR01.prod.protection.outlook.com (10.152.3.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.776.10; Sat, 19 May 2018 10:50:26 +0000 Received: from VI1PR0801MB1790.eurprd08.prod.outlook.com (10.152.2.60) by VE1EUR01FT028.mail.protection.outlook.com (10.152.2.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.776.10 via Frontend Transport; Sat, 19 May 2018 10:50:26 +0000 Received: from VI1PR0801MB1790.eurprd08.prod.outlook.com ([fe80::7010:5d5e:8dcf:d92e]) by VI1PR0801MB1790.eurprd08.prod.outlook.com ([fe80::7010:5d5e:8dcf:d92e%17]) with mapi id 15.20.0776.010; Sat, 19 May 2018 10:50:26 +0000 From: =?iso-8859-1?Q?Marvin_H=E4user?= To: "edk2-devel@lists.01.org" CC: "yonghong.zhu@intel.com" , "liming.gao@intel.com" Thread-Topic: [PATCH] BaseTools: Rename String to StringUtils. Thread-Index: AQHT718xL9LFoyYa8kS09y4lQtmhVA== Date: Sat, 19 May 2018 10:50:25 +0000 Message-ID: Accept-Language: de-DE, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM5PR0701CA0065.eurprd07.prod.outlook.com (2603:10a6:203:2::27) To VI1PR0801MB1790.eurprd08.prod.outlook.com (2603:10a6:800:5b::15) x-incomingtopheadermarker: OriginalChecksum:494966F919CA280E0F47AD4AD1A8B83C46D7AF8B2584C3E43DA05E4D1DEEAC5C; UpperCasedChecksum:979748AA9D0134C85A72E97FBF1FF9AFF91DB534FED1B40A1E3D561348ECD348; SizeAsReceived:7463; Count:48 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [k4OIdMb9dnjTq31I6B6pwzrHVVGZ1gjp] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VE1EUR01HT185; 7:wEIIA2UUwQTUjr893ln3NEGjOTAJ7A+tRYPEPwVhF2eZiiR66e/MXmzLoGjanav7mQwhBwjQhl526lyMDDdGSuUTEwBURwKQqreC2B5OVbbSZg+65ugwNMy3wUA//wpyPM2TstS9UJ3gmXM5YH4qVIZouG3kQpvba95cBhEX4dLhN/m5zlsVRHWhz1KZ3C6OhTzQ5Z5ab1Usn3j+Ay6h1rplEayeg8zh9Z4lp1iz9vHCzoiDHcFRjxxohJ7IaLGd x-incomingheadercount: 48 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1603101448)(1601125466)(1701031045); SRVR:VE1EUR01HT185; x-ms-traffictypediagnostic: VE1EUR01HT185: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:VE1EUR01HT185; BCL:0; PCL:0; RULEID:; SRVR:VE1EUR01HT185; x-forefront-prvs: 0677FFABBF x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(199004)(189003)(81156014)(5250100002)(102836004)(2501003)(20460500001)(26005)(6346003)(6436002)(386003)(8676002)(33656002)(5640700003)(97736004)(7696005)(5660300001)(305945005)(87572001)(104016004)(74316002)(25786009)(2900100001)(99286004)(2351001)(68736007)(86362001)(575784001)(72206003)(426003)(3660700001)(486006)(4326008)(476003)(54906003)(82202002)(1857600001)(3280700002)(105586002)(8936002)(53946003)(106356001)(55016002)(14454004)(6916009)(559001)(579004)(19627235001); DIR:OUT; SFP:1901; SCL:1; SRVR:VE1EUR01HT185; H:VI1PR0801MB1790.eurprd08.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:; received-spf: None (protection.outlook.com: outlook.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Marvin.Haeuser@outlook.com; x-microsoft-antispam-message-info: 9KByeLW57EadYf59UMCpvfByETzCd0RW8x3hcgTgMSg91WtOcs3/trK5sYoGKANt5od0CMknnzo8ao3a3G7YlU3oO3IUt/tOwSVe1/EYrdZksmKxXqZctizSBL0ikO7EXm68G58VFMHeZfl8Gr5LvJiwzvx9jVe1qfTJctWMzcYQ88E5/Pbh7D1QO/36gu01 MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 18bab566-8548-4b5e-0c6b-08d5bd7653a5 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-Network-Message-Id: 18bab566-8548-4b5e-0c6b-08d5bd7653a5 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-originalarrivaltime: 19 May 2018 10:50:25.9596 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR01HT185 Subject: [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: Sat, 19 May 2018 10:50:30 -0000 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable 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. 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(-) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/= 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/Sou= rce/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 a= s 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/Pyt= hon/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/Source/= 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 a= s 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/Source= /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/BaseTools/= 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/BaseTools/= 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/Source/= 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/P= ython/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/Py= thon/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/BaseToo= ls/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/Sourc= e/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/E= cc/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.p= y 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, Pa= thClass, AnalyzePcdData from Common.Expression import * from CommonDataClass.Exceptions import * diff --git a/BaseTools/Source/Python/Eot/Eot.py b/BaseTools/Source/Python/E= ot/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/Sourc= e/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/Pytho= n/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, ReplaceMacr= o 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/S= ource/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/Source= /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/BaseTools/= 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/Py= thon/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/BaseToo= ls/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/Mak= efile 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\B= uildToolError.py \ $(BASE_TOOLS_PATH)\Source\Python\Common\LongFilePathSupport.= 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\TargetTxtClassObject= .py \ $(BASE_TOOLS_PATH)\Source\Python\Common\ToolDefClassObject.p= y \ $(BASE_TOOLS_PATH)\Source\Python\Common\VpdInfoFile.py \ @@ -167,7 +167,7 @@ CMD_UPT=3D$(BASE_TOOLS_PATH)\Source\Python\UPT\Core\Dep= endencyRules.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/So= urce/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/P= ython/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/P= ython/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/So= urce/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/P= ython/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/Source/= 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/Sou= rce/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/S= ource/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/P= ython/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/P= ython/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/Source= /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/Sourc= e/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/Sour= ce/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/BaseTools/= 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 IMP= LIED. # -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/BaseTools/= 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 conve= rt 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/BaseTools/= 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 IMP= LIED. # =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/BaseTool= s/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, Pa= thClass, AnalyzePcdData, AnalyzeDscPcd, AnalyzePcdExpression, ParseFieldVal= ue from Common.Expression import * from CommonDataClass.Exceptions import * diff --git a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py b/BaseT= ools/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/Sourc= e/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 * --=20 2.17.0.windows.1