From af881abc6537298feade1c0b01a2a77224635647 Mon Sep 17 00:00:00 2001 From: Yunhua Feng Date: Mon, 3 Dec 2018 10:29:40 +0800 Subject: [PATCH] BaseTools: replace long by int replace long by int Because the long() was not exist in Python3 Cc: Bob Feng Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yunhua Feng Tested-by: Laszlo Ersek Tested-by: Ard Biesheuvel Reviewed-by: Liming Gao Reviewed-by: Bob Feng --- .../Python/AutoGen/ValidCheckingInfoObject.py | 4 ++-- BaseTools/Source/Python/Common/Misc.py | 2 +- .../Source/Python/GenFds/AprioriSection.py | 2 +- BaseTools/Source/Python/GenFds/FdfParser.py | 18 +++++++++--------- BaseTools/Source/Python/GenFds/GenFds.py | 8 ++++---- BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py | 10 +++++----- .../Rsa2048Sha256Sign/Rsa2048Sha256Sign.py | 4 ++-- .../Source/Python/UPT/Parser/DecParser.py | 6 +++--- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py b/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py index edd40a1498..6ddf38fd0d 100644 --- a/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py +++ b/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py @@ -57,7 +57,7 @@ class VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER(object): itemIndex += 1 realLength += 5 for v_data in item.data: - if type(v_data) in (int, long): + if isinstance(v_data, int): realLength += item.StorageWidth else: realLength += item.StorageWidth @@ -137,7 +137,7 @@ class VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER(object): Buffer += b realLength += 1 for v_data in item.data: - if type(v_data) in (int, long): + if isinstance(v_data, int): b = pack(PACK_CODE_BY_SIZE[item.StorageWidth], v_data) Buffer += b realLength += item.StorageWidth diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py index 9967ac470c..1b8a4bef2e 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -1313,7 +1313,7 @@ def CheckPcdDatum(Type, Value): if Value and int(Value, 0) < 0: return False, "PCD can't be set to negative value[%s] for datum type [%s]" % (Value, Type) try: - Value = long(Value, 0) + Value = int(Value, 0) if Value > MAX_VAL_TYPE[Type]: return False, "Too large PCD value[%s] for datum type [%s]" % (Value, Type) except: diff --git a/BaseTools/Source/Python/GenFds/AprioriSection.py b/BaseTools/Source/Python/GenFds/AprioriSection.py index e7b856a115..55d99320c7 100644 --- a/BaseTools/Source/Python/GenFds/AprioriSection.py +++ b/BaseTools/Source/Python/GenFds/AprioriSection.py @@ -97,7 +97,7 @@ class AprioriSection (object): % (InfFileName, GenFdsGlobalVariable.ArchList)) GuidPart = Guid.split('-') - Buffer.write(pack('I', long(GuidPart[0], 16))) + Buffer.write(pack('I', int(GuidPart[0], 16))) Buffer.write(pack('H', int(GuidPart[1], 16))) Buffer.write(pack('H', int(GuidPart[2], 16))) diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py index 3bcfd2d42a..69cb7de8e5 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -1562,7 +1562,7 @@ class FdfParser: self.SetPcdLocalation(pcdPair) FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber) self.Profile.PcdFileLineDict[pcdPair] = FileLineTuple - Obj.Size = long(Size, 0) + Obj.Size = int(Size, 0) return True if self._IsKeyword("ErasePolarity"): @@ -1597,7 +1597,7 @@ class FdfParser: if not self._GetNextDecimalNumber() and not self._GetNextHexNumber(): raise Warning.Expected("address", self.FileName, self.CurrentLineNumber) - BsAddress = long(self._Token, 0) + BsAddress = int(self._Token, 0) Obj.BsBaseAddress = BsAddress if self._IsKeyword("RtBaseAddress"): @@ -1607,7 +1607,7 @@ class FdfParser: if not self._GetNextDecimalNumber() and not self._GetNextHexNumber(): raise Warning.Expected("address", self.FileName, self.CurrentLineNumber) - RtAddress = long(self._Token, 0) + RtAddress = int(self._Token, 0) Obj.RtBaseAddress = RtAddress ## _GetBlockStatements() method @@ -1655,7 +1655,7 @@ class FdfParser: self.SetPcdLocalation(PcdPair) FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber) self.Profile.PcdFileLineDict[PcdPair] = FileLineTuple - BlockSize = long(BlockSize, 0) + BlockSize = int(BlockSize, 0) BlockNumber = None if self._IsKeyword("NumBlocks"): @@ -1665,7 +1665,7 @@ class FdfParser: if not self._GetNextDecimalNumber() and not self._GetNextHexNumber(): raise Warning.Expected("block numbers", self.FileName, self.CurrentLineNumber) - BlockNumber = long(self._Token, 0) + BlockNumber = int(self._Token, 0) Obj.BlockSizeList.append((BlockSize, BlockNumber, BlockSizePcd)) return True @@ -1774,7 +1774,7 @@ class FdfParser: Expr += CurCh self._GetOneChar() try: - return long( + return int( ValueExpression(Expr, self._CollectMacroPcd() )(True), 0) @@ -1822,7 +1822,7 @@ class FdfParser: RegionOffsetPcdPattern.match(self._CurrentLine()[self.CurrentOffsetWithinLine:])) if IsRegionPcd: RegionObj.PcdOffset = self._GetNextPcdSettings() - self.Profile.PcdDict[RegionObj.PcdOffset] = "0x%08X" % (RegionObj.Offset + long(theFd.BaseAddress, 0)) + self.Profile.PcdDict[RegionObj.PcdOffset] = "0x%08X" % (RegionObj.Offset + int(theFd.BaseAddress, 0)) self.SetPcdLocalation(RegionObj.PcdOffset) self._PcdDict['%s.%s' % (RegionObj.PcdOffset[1], RegionObj.PcdOffset[0])] = "0x%x" % RegionObj.Offset FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber) @@ -3134,9 +3134,9 @@ class FdfParser: if FdfParser._Verify(Name, Value, 'UINT64'): FmpData.MonotonicCount = Value if FmpData.MonotonicCount.upper().startswith('0X'): - FmpData.MonotonicCount = (long)(FmpData.MonotonicCount, 16) + FmpData.MonotonicCount = int(FmpData.MonotonicCount, 16) else: - FmpData.MonotonicCount = (long)(FmpData.MonotonicCount) + FmpData.MonotonicCount = int(FmpData.MonotonicCount) if not self._GetNextToken(): break else: diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py index 2a5d473e3f..ae5d7fd26d 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -626,9 +626,9 @@ class GenFds(object): GenFdsGlobalVariable.InfLogger('\nFV Space Information') for FvSpaceInfo in FvSpaceInfoList: Name = FvSpaceInfo[0] - TotalSizeValue = long(FvSpaceInfo[1], 0) - UsedSizeValue = long(FvSpaceInfo[2], 0) - FreeSizeValue = long(FvSpaceInfo[3], 0) + TotalSizeValue = int(FvSpaceInfo[1], 0) + UsedSizeValue = int(FvSpaceInfo[2], 0) + FreeSizeValue = int(FvSpaceInfo[3], 0) if UsedSizeValue == TotalSizeValue: Percentage = '100' else: @@ -655,7 +655,7 @@ class GenFds(object): if PcdValue == '': return - Int64PcdValue = long(PcdValue, 0) + Int64PcdValue = int(PcdValue, 0) if Int64PcdValue == 0 or Int64PcdValue < -1: return diff --git a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py b/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py index a44781f2e8..c5c99d94ef 100644 --- a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py +++ b/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py @@ -141,11 +141,11 @@ if __name__ == '__main__': try: if args.MonotonicCountStr.upper().startswith('0X'): - args.MonotonicCountValue = (long)(args.MonotonicCountStr, 16) + args.MonotonicCountValue = int(args.MonotonicCountStr, 16) else: - args.MonotonicCountValue = (long)(args.MonotonicCountStr) + args.MonotonicCountValue = int(args.MonotonicCountStr) except: - args.MonotonicCountValue = (long)(0) + args.MonotonicCountValue = int(0) if args.Encode: # @@ -251,9 +251,9 @@ if __name__ == '__main__': sys.exit(1) else: if args.SignatureSizeStr.upper().startswith('0X'): - SignatureSize = (long)(args.SignatureSizeStr, 16) + SignatureSize = int(args.SignatureSizeStr, 16) else: - SignatureSize = (long)(args.SignatureSizeStr) + SignatureSize = int(args.SignatureSizeStr) if SignatureSize < 0: print("ERROR: The value of option --signature-size can't be set to negative value!") sys.exit(1) diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py index 370ae2e3fa..3a1a2dff00 100644 --- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py +++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py @@ -163,9 +163,9 @@ if __name__ == '__main__': if args.MonotonicCountStr: try: if args.MonotonicCountStr.upper().startswith('0X'): - args.MonotonicCountValue = (long)(args.MonotonicCountStr, 16) + args.MonotonicCountValue = int(args.MonotonicCountStr, 16) else: - args.MonotonicCountValue = (long)(args.MonotonicCountStr) + args.MonotonicCountValue = int(args.MonotonicCountStr) except: pass diff --git a/BaseTools/Source/Python/UPT/Parser/DecParser.py b/BaseTools/Source/Python/UPT/Parser/DecParser.py index a88b51d055..8f3d60df57 100644 --- 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): self._LoggerError(ST.ERR_DECPARSE_PCD_TOKEN % Token) elif not Token.startswith('0x') and not Token.startswith('0X'): - if long(Token) > 4294967295: + if int(Token) > 4294967295: self._LoggerError(ST.ERR_DECPARSE_PCD_TOKEN_INT % Token) - Token = hex(long(Token))[:-1] + Token = hex(int(Token))[:-1] - IntToken = long(Token, 0) + IntToken = int(Token, 0) if (Guid, IntToken) in self.TokenMap: if self.TokenMap[Guid, IntToken] != CName: self._LoggerError(ST.ERR_DECPARSE_PCD_TOKEN_UNIQUE%(Token)) -- 2.39.2