From 5a57246eab80f00ae2481970d12a2abc345a2730 Mon Sep 17 00:00:00 2001
From: "Marvin.Haeuser@outlook.com" <Marvin.Haeuser@outlook.com>
Date: Sat, 19 May 2018 18:50:25 +0800
Subject: [PATCH] BaseTools: Rename String to StringUtils.

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 <Marvin.Haeuser@outlook.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
---
 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 => StringUtils.py}  | 0
 BaseTools/Source/Python/Common/ToolDefClassObject.py          | 2 +-
 BaseTools/Source/Python/Ecc/Configuration.py                  | 2 +-
 BaseTools/Source/Python/Ecc/Ecc.py                            | 2 +-
 .../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 +-
 .../Source/Python/UPT/Library/{String.py => 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(-)
 rename BaseTools/Source/Python/Common/{String.py => StringUtils.py} (100%)
 rename BaseTools/Source/Python/UPT/Library/{String.py => StringUtils.py} (100%)

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index cf58abf251..9a57b9abd9 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/Source/Python/AutoGen/BuildEngine.py
index dd6301b01f..ad1919442e 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 *
 
 import Common.EdkLogger as EdkLogger
diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
index 40a343ca10..1be27d2b89 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 a373507422..6e83b3d73e 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/Source/Python/AutoGen/GenPcdDb.py
index d2d42fe9d0..2e05b77e14 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 769790d965..e5b933c203 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 54b6fb22a0..5a3c254778 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 a81a44731f..d3340f5a90 100644
--- a/BaseTools/Source/Python/Common/Database.py
+++ b/BaseTools/Source/Python/Common/Database.py
@@ -19,7 +19,7 @@ import Common.LongFilePathOs as os
 
 import EdkLogger as EdkLogger
 from CommonDataClass.DataClass import *
-from String import *
+from StringUtils import *
 from DataType import *
 
 from Table.TableDataModel import TableDataModel
diff --git a/BaseTools/Source/Python/Common/Parsing.py b/BaseTools/Source/Python/Common/Parsing.py
index 453c2039e3..527852a50c 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 *
 
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/BaseTools/Source/Python/Common/ToolDefClassObject.py
index 83359586b9..dd985ab303 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/Source/Python/Ecc/Configuration.py
index fee7ecb970..217b60f4f3 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
 
 _ConfigFileToInternalTranslation = {
diff --git a/BaseTools/Source/Python/Ecc/Ecc.py b/BaseTools/Source/Python/Ecc/Ecc.py
index 60dfc00260..e78d70372e 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
 
-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 4d61cd1cea..3749f6a269 100644
--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
@@ -26,7 +26,7 @@ import EccToolError
 
 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 786868d55d..dfd1146af7 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, sdict
 from InfParserLite import *
diff --git a/BaseTools/Source/Python/Eot/InfParserLite.py b/BaseTools/Source/Python/Eot/InfParserLite.py
index 8867bb5dc2..584a95d6f3 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
 
diff --git a/BaseTools/Source/Python/Eot/Parser.py b/BaseTools/Source/Python/Eot/Parser.py
index 14c287588a..ff88e957ad 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, ReplaceMacro
 import EotGlobalData
-from Common.String import GetSplitList
+from Common.StringUtils import GetSplitList
 from Common.LongFilePathSupport import OpenLongFilePath as open
 
 ## PreProcess() method
diff --git a/BaseTools/Source/Python/GenFds/AprioriSection.py b/BaseTools/Source/Python/GenFds/AprioriSection.py
index 7cf792b5b2..6b81b42620 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 4518d8f2af..ddc5c930d4 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 c332eee607..b26821b290 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 f0b51e25df..339b998673 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/BaseTools/Source/Python/GenFds/OptRomInfStatement.py
index a865ac4436..79891b3b82 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
 
 from Common.DataType import *
-from Common.String import *
+from Common.StringUtils import *
 from FfsInfStatement import FfsInfStatement
 from GenFdsGlobalVariable import GenFdsGlobalVariable
 
diff --git a/BaseTools/Source/Python/Makefile b/BaseTools/Source/Python/Makefile
index 8466f6ebab..d78b12d505 100644
--- a/BaseTools/Source/Python/Makefile
+++ b/BaseTools/Source/Python/Makefile
@@ -46,7 +46,7 @@ COMMON_PYTHON=$(BASE_TOOLS_PATH)\Source\Python\Common\BuildToolError.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.py \
               $(BASE_TOOLS_PATH)\Source\Python\Common\VpdInfoFile.py \
@@ -167,7 +167,7 @@ CMD_UPT=$(BASE_TOOLS_PATH)\Source\Python\UPT\Core\DependencyRules.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 9c3d7bd934..2c37592fc6 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
 
 ## TableDataModel
 #
diff --git a/BaseTools/Source/Python/Table/TableDec.py b/BaseTools/Source/Python/Table/TableDec.py
index 6b7d22c938..97139c58d8 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
 
 ## TableDec
 #
diff --git a/BaseTools/Source/Python/Table/TableDsc.py b/BaseTools/Source/Python/Table/TableDsc.py
index 69477d544d..4ac54933aa 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
 
 ## TableDsc
 #
diff --git a/BaseTools/Source/Python/Table/TableEotReport.py b/BaseTools/Source/Python/Table/TableEotReport.py
index 740105c8f9..bccf25ca45 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
 
diff --git a/BaseTools/Source/Python/Table/TableFdf.py b/BaseTools/Source/Python/Table/TableFdf.py
index 927b5d1a3b..eea8e9404d 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
 
 ## TableFdf
 #
diff --git a/BaseTools/Source/Python/Table/TableFile.py b/BaseTools/Source/Python/Table/TableFile.py
index caf749e9d3..ac762ea7fc 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
 
diff --git a/BaseTools/Source/Python/Table/TableFunction.py b/BaseTools/Source/Python/Table/TableFunction.py
index 3d7c2d0ea5..3d40bd61f6 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
 
 ## TableFunction
 #
diff --git a/BaseTools/Source/Python/Table/TableIdentifier.py b/BaseTools/Source/Python/Table/TableIdentifier.py
index bcd6d6e1c1..0ec8b3c162 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
 
 ## TableIdentifier
diff --git a/BaseTools/Source/Python/Table/TableInf.py b/BaseTools/Source/Python/Table/TableInf.py
index b6e300b150..478b77776e 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
 
 ## TableInf
 #
diff --git a/BaseTools/Source/Python/Table/TablePcd.py b/BaseTools/Source/Python/Table/TablePcd.py
index 19623f98f4..ca1c0f0c8a 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
 
 ## TablePcd
 #
diff --git a/BaseTools/Source/Python/Table/TableQuery.py b/BaseTools/Source/Python/Table/TableQuery.py
index e1d2537394..f377b10561 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
 
 ## TableQuery
diff --git a/BaseTools/Source/Python/Table/TableReport.py b/BaseTools/Source/Python/Table/TableReport.py
index 4af0e98d86..9ce1d0aa25 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/Source/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 1fbd095f74..99257d0814 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 IMPLIED.
 #
-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 0262a91ed8..1ed7eb1c2c 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 convert 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 bd1c841541..836140759f 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 IMPLIED.
 #
 
-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/BaseTools/Source/Python/Workspace/MetaFileParser.py
index 36843643ed..8ab1dd23a0 100644
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -26,7 +26,7 @@ import Common.GlobalData as GlobalData
 
 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 14dcb1ae81..9e055fcfc4 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/Source/Python/build/BuildReport.py
index cf45ef1734..3c495a6b1b 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.39.2