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>
This commit is contained in:
committed by
Liming Gao
parent
ba94c38f08
commit
5a57246eab
@ -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
|
||||
#
|
||||
|
@ -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
|
||||
#
|
||||
|
@ -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
|
||||
#
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
#
|
||||
|
@ -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
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
#
|
||||
import Common.EdkLogger as EdkLogger
|
||||
from Table import Table
|
||||
from Common.String import ConvertToSqlString
|
||||
from Common.StringUtils import ConvertToSqlString
|
||||
|
||||
## TableFunction
|
||||
#
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
#
|
||||
|
@ -16,7 +16,7 @@
|
||||
#
|
||||
import Common.EdkLogger as EdkLogger
|
||||
from Table import Table
|
||||
from Common.String import ConvertToSqlString
|
||||
from Common.StringUtils import ConvertToSqlString
|
||||
|
||||
## TablePcd
|
||||
#
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user