diff options
| author | Zhijux Fan <zhijux.fan@intel.com> | 2018-12-17 15:18:01 +0800 |
|---|---|---|
| committer | Feng, Bob C <bob.c.feng@intel.com> | 2019-02-01 11:09:19 +0800 |
| commit | 174a9d3cc8f74f7a731ac5f16ce6864c8eb359ec (patch) | |
| tree | 097f344f323364c6cf0599eba5977863289b1654 /BaseTools/Source/Python/UPT/Library/UniClassObject.py | |
| parent | 1590d12315b0dd1f348554149257b09ad23f3e67 (diff) | |
| download | edk2-174a9d3cc8f74f7a731ac5f16ce6864c8eb359ec.tar.gz edk2-174a9d3cc8f74f7a731ac5f16ce6864c8eb359ec.tar.bz2 edk2-174a9d3cc8f74f7a731ac5f16ce6864c8eb359ec.zip | |
BaseTools/UPT:merge UPT Tool use Python2 and Python3
In UPT Tool,merge python2 and python3
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
Diffstat (limited to 'BaseTools/Source/Python/UPT/Library/UniClassObject.py')
| -rw-r--r-- | BaseTools/Source/Python/UPT/Library/UniClassObject.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/BaseTools/Source/Python/UPT/Library/UniClassObject.py b/BaseTools/Source/Python/UPT/Library/UniClassObject.py index cd575d5a34..bd7804b753 100644 --- a/BaseTools/Source/Python/UPT/Library/UniClassObject.py +++ b/BaseTools/Source/Python/UPT/Library/UniClassObject.py @@ -119,10 +119,12 @@ def UniToHexList(Uni): # @retval NewUni: The converted unicode string
#
def ConvertSpecialUnicodes(Uni):
- NewUni = Uni
+ OldUni = NewUni = Uni
NewUni = NewUni.replace(u'\u00A9', '(c)')
NewUni = NewUni.replace(u'\u00AE', '(r)')
NewUni = NewUni.replace(u'\u2122', '(tm)')
+ if OldUni == NewUni:
+ NewUni = OldUni
return NewUni
## GetLanguageCode1766
@@ -513,7 +515,7 @@ class UniFileClassObject(object): FileIn[LineCount-1] = Line
FileIn[LineCount] = '\r\n'
LineCount -= 1
- for Index in xrange (LineCount + 1, len (FileIn) - 1):
+ for Index in range (LineCount + 1, len (FileIn) - 1):
if (Index == len(FileIn) -1):
FileIn[Index] = '\r\n'
else:
|