diff options
| author | Marvin.Haeuser@outlook.com <Marvin.Haeuser@outlook.com> | 2018-05-19 18:50:25 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2018-05-28 13:05:00 +0800 |
| commit | 5a57246eab80f00ae2481970d12a2abc345a2730 (patch) | |
| tree | 432ca762bf2573de78649b75065193d3840432ba /BaseTools/Source/Python/Table | |
| parent | ba94c38f08734fa10143f44955c705ed9d14faf4 (diff) | |
| download | edk2-5a57246eab80f00ae2481970d12a2abc345a2730.tar.gz edk2-5a57246eab80f00ae2481970d12a2abc345a2730.tar.bz2 edk2-5a57246eab80f00ae2481970d12a2abc345a2730.zip | |
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>
Diffstat (limited to 'BaseTools/Source/Python/Table')
| -rw-r--r-- | BaseTools/Source/Python/Table/TableDataModel.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Table/TableDec.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Table/TableDsc.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Table/TableEotReport.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Table/TableFdf.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Table/TableFile.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Table/TableFunction.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Table/TableIdentifier.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Table/TableInf.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Table/TablePcd.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Table/TableQuery.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Table/TableReport.py | 2 |
12 files changed, 12 insertions, 12 deletions
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
|