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/Common | |
| 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/Common')
| -rw-r--r-- | BaseTools/Source/Python/Common/Database.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Common/Parsing.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Common/StringUtils.py (renamed from BaseTools/Source/Python/Common/String.py) | 0 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Common/ToolDefClassObject.py | 2 |
4 files changed, 3 insertions, 3 deletions
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 index 34361ecdd5..34361ecdd5 100644 --- a/BaseTools/Source/Python/Common/String.py +++ b/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
|