Revert BaseTools: PYTHON3 migration

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Parser / DecParser.py

diff --git a/BaseTools/Source/Python/UPT/Parser/DecParser.py b/BaseTools/Source/Python/UPT/Parser/DecParser.py
index 51dc4b2bd24102f34a9f4e7dfe7ce2d489a1fb9a..a88b51d05529253f15c5254504afd3d484850596 100644 (file)
--- a/BaseTools/Source/Python/UPT/Parser/DecParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/DecParser.py
@@ -620,11 +620,11 @@ class _DecPcd(_DecBase):
         if not IsValidToken(PCD_TOKEN_PATTERN, Token):\r
             self._LoggerError(ST.ERR_DECPARSE_PCD_TOKEN % Token)\r
         elif not Token.startswith('0x') and not Token.startswith('0X'):\r
-            if int(Token) > 4294967295:\r
+            if long(Token) > 4294967295:\r
                 self._LoggerError(ST.ERR_DECPARSE_PCD_TOKEN_INT % Token)\r
-            Token = hex(int(Token))\r
+            Token = hex(long(Token))[:-1]\r
 \r
-        IntToken = int(Token, 0)\r
+        IntToken = long(Token, 0)\r
         if (Guid, IntToken) in self.TokenMap:\r
             if self.TokenMap[Guid, IntToken] != CName:\r
                 self._LoggerError(ST.ERR_DECPARSE_PCD_TOKEN_UNIQUE%(Token))\r
@@ -752,7 +752,7 @@ class _DecUserExtension(_DecBase):
 class Dec(_DecBase, _DecComments):\r
     def __init__(self, DecFile, Parse = True):\r
         try:\r
-            Content = ConvertSpecialChar(open(DecFile, 'r').readlines())\r
+            Content = ConvertSpecialChar(open(DecFile, 'rb').readlines())\r
         except BaseException:\r
             Logger.Error(TOOL_NAME, FILE_OPEN_FAILURE, File=DecFile,\r
                          ExtraData=ST.ERR_DECPARSE_FILEOPEN % DecFile)\r