diff options
| author | Hess Chen <hesheng.chen@intel.com> | 2015-12-30 02:22:02 +0000 |
|---|---|---|
| committer | hchen30 <hchen30@Edk2> | 2015-12-30 02:22:02 +0000 |
| commit | 975889279df2eb3d3338cb88afb3faa71ddde4d6 (patch) | |
| tree | 64ba1eab43fbf1fa9fef9de56e9e098378e26b7c | |
| parent | f3964772d24214b5edaf45264907a1e761c395e8 (diff) | |
| download | edk2-975889279df2eb3d3338cb88afb3faa71ddde4d6.tar.gz edk2-975889279df2eb3d3338cb88afb3faa71ddde4d6.tar.bz2 edk2-975889279df2eb3d3338cb88afb3faa71ddde4d6.zip | |
BaseTool/ECC: Add UTF-8 support on ECC tool
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hess Chen <hesheng.chen@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19575 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py index 123d694939..aaea1ab3fc 100644 --- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py @@ -2000,9 +2000,11 @@ class UniParser(object): def __read(self):
try:
- self.FileIn = CodecOpenLongFilePath(self.FilePath, Mode = 'rb', Encoding = 'utf_16').read()
+ self.FileIn = CodecOpenLongFilePath(self.FilePath, Mode='rb', Encoding='utf_8').read()
except UnicodeError:
- self.FileIn = CodecOpenLongFilePath(self.FilePath, Mode = 'rb', Encoding = 'utf_16_le').read()
+ self.FileIn = CodecOpenLongFilePath(self.FilePath, Mode='rb', Encoding='utf_16').read()
+ except UnicodeError:
+ self.FileIn = CodecOpenLongFilePath(self.FilePath, Mode='rb', Encoding='utf_16_le').read()
except IOError:
self.FileIn = ""
|