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>

1 files changed, 2 insertions, 2 deletions

diff --git a/BaseTools/Source/Python/UPT/Parser/DecParser.py b/BaseTools/Source/Python/UPT/Parser/DecParser.py
index 8f3d60df57..f7eeb84127 100644
--- a/BaseTools/Source/Python/UPT/Parser/DecParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/DecParser.py
@@ -622,7 +622,7 @@ class _DecPcd(_DecBase):
         elif not Token.startswith('0x') and not Token.startswith('0X'):

             if int(Token) > 4294967295:

                 self._LoggerError(ST.ERR_DECPARSE_PCD_TOKEN_INT % Token)

-            Token = hex(int(Token))[:-1]

+            Token = '0x%x' % int(Token)

 

         IntToken = int(Token, 0)

         if (Guid, IntToken) in self.TokenMap:

@@ -752,7 +752,7 @@ class _DecUserExtension(_DecBase):
 class Dec(_DecBase, _DecComments):

     def __init__(self, DecFile, Parse = True):

         try:

-            Content = ConvertSpecialChar(open(DecFile, 'rb').readlines())

+            Content = ConvertSpecialChar(open(DecFile, 'r').readlines())

         except BaseException:

             Logger.Error(TOOL_NAME, FILE_OPEN_FAILURE, File=DecFile,

                          ExtraData=ST.ERR_DECPARSE_FILEOPEN % DecFile)