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/Eot | |
| 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/Eot')
| -rw-r--r-- | BaseTools/Source/Python/Eot/Eot.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Eot/InfParserLite.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Eot/Parser.py | 4 |
3 files changed, 4 insertions, 4 deletions
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
|