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 502f607f8d..40c0105a3c 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -1591,7 +1591,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: @@ -2081,7 +2081,7 @@ def PackRegistryFormatGuid(Guid): # @retval Value The integer value that the input represents # def GetIntegerValue(Input): - if type(Input) in (int, long): + if isinstance(Input, int): return Input String = Input if String.endswith("U"): diff --git a/BaseTools/Source/Python/GenFds/AprioriSection.py b/BaseTools/Source/Python/GenFds/AprioriSection.py index aaa919d7a8..c50a0c5b02 100644 --- a/BaseTools/Source/Python/GenFds/AprioriSection.py +++ b/BaseTools/Source/Python/GenFds/AprioriSection.py @@ -96,7 +96,7 @@ class AprioriSection (AprioriSectionClassObject): 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 d18b0a3328..cbdc893cdf 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -1615,7 +1615,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"): @@ -1651,7 +1651,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"): @@ -1661,7 +1661,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 @@ -1709,7 +1709,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"): @@ -1719,7 +1719,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 @@ -1828,7 +1828,7 @@ class FdfParser: Expr += CurCh self.__GetOneChar() try: - return long( + return int( ValueExpression(Expr, self.__CollectMacroPcd() )(True), 0) @@ -1876,7 +1876,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(Fd.BaseAddress, 0)) + self.Profile.PcdDict[RegionObj.PcdOffset] = "0x%08X" % (RegionObj.Offset + int(Fd.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) @@ -3231,9 +3231,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 5c22755bb7..904bd84089 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -557,9 +557,9 @@ class GenFds : 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: @@ -585,7 +585,7 @@ class GenFds : 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 47677cc28e..c48425d0cd 100644 --- a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py +++ b/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py @@ -140,11 +140,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: # @@ -250,9 +250,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 50a442dd4a..2856359631 100644 --- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py +++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py @@ -162,9 +162,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