BaseTools: Rename long() to int()
Because the long() function was not exist in Python3. Cc: Liming Gao <liming.gao@intel.com> Cc: Yonghong Zhu <yonghong.zhu@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
committed by
Yonghong Zhu
parent
261eee25de
commit
8371d87412
@@ -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)))
|
||||
|
||||
|
@@ -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:
|
||||
|
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user