BaseTool:Rename xrange() to range()
Because the xrange() was not exist in 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> Reviewed-by: Liming Gao <liming.gao@intel.com> Reviewed-by: Bob Feng <bob.c.feng@intel.com>
This commit is contained in:
@ -261,7 +261,7 @@ class DbItemList:
|
||||
# Variable length, need to calculate one by one
|
||||
#
|
||||
assert(Index < len(self.RawDataList))
|
||||
for ItemIndex in xrange(Index):
|
||||
for ItemIndex in range(Index):
|
||||
Offset += len(self.RawDataList[ItemIndex])
|
||||
else:
|
||||
Offset = self.ItemSize * Index
|
||||
@ -348,7 +348,7 @@ class DbComItemList (DbItemList):
|
||||
assert(False)
|
||||
else:
|
||||
assert(Index < len(self.RawDataList))
|
||||
for ItemIndex in xrange(Index):
|
||||
for ItemIndex in range(Index):
|
||||
Offset += len(self.RawDataList[ItemIndex]) * self.ItemSize
|
||||
|
||||
return Offset
|
||||
@ -414,7 +414,7 @@ class DbStringHeadTableItemList(DbItemList):
|
||||
# Variable length, need to calculate one by one
|
||||
#
|
||||
assert(Index < len(self.RawDataList))
|
||||
for ItemIndex in xrange(Index):
|
||||
for ItemIndex in range(Index):
|
||||
Offset += len(self.RawDataList[ItemIndex])
|
||||
else:
|
||||
for innerIndex in range(Index):
|
||||
@ -498,14 +498,14 @@ class DbStringItemList (DbComItemList):
|
||||
assert(len(RawDataList) == len(LenList))
|
||||
DataList = []
|
||||
# adjust DataList according to the LenList
|
||||
for Index in xrange(len(RawDataList)):
|
||||
for Index in range(len(RawDataList)):
|
||||
Len = LenList[Index]
|
||||
RawDatas = RawDataList[Index]
|
||||
assert(Len >= len(RawDatas))
|
||||
ActualDatas = []
|
||||
for i in xrange(len(RawDatas)):
|
||||
for i in range(len(RawDatas)):
|
||||
ActualDatas.append(RawDatas[i])
|
||||
for i in xrange(len(RawDatas), Len):
|
||||
for i in range(len(RawDatas), Len):
|
||||
ActualDatas.append(0)
|
||||
DataList.append(ActualDatas)
|
||||
self.LenList = LenList
|
||||
@ -514,7 +514,7 @@ class DbStringItemList (DbComItemList):
|
||||
Offset = 0
|
||||
|
||||
assert(Index < len(self.LenList))
|
||||
for ItemIndex in xrange(Index):
|
||||
for ItemIndex in range(Index):
|
||||
Offset += self.LenList[ItemIndex]
|
||||
|
||||
return Offset
|
||||
@ -702,7 +702,7 @@ def BuildExDataBase(Dict):
|
||||
|
||||
# Get offset of SkuId table in the database
|
||||
SkuIdTableOffset = FixedHeaderLen
|
||||
for DbIndex in xrange(len(DbTotal)):
|
||||
for DbIndex in range(len(DbTotal)):
|
||||
if DbTotal[DbIndex] is SkuidValue:
|
||||
break
|
||||
SkuIdTableOffset += DbItemTotal[DbIndex].GetListSize()
|
||||
@ -714,7 +714,7 @@ def BuildExDataBase(Dict):
|
||||
for (LocalTokenNumberTableIndex, (Offset, Table)) in enumerate(LocalTokenNumberTable):
|
||||
DbIndex = 0
|
||||
DbOffset = FixedHeaderLen
|
||||
for DbIndex in xrange(len(DbTotal)):
|
||||
for DbIndex in range(len(DbTotal)):
|
||||
if DbTotal[DbIndex] is Table:
|
||||
DbOffset += DbItemTotal[DbIndex].GetInterOffset(Offset)
|
||||
break
|
||||
@ -740,7 +740,7 @@ def BuildExDataBase(Dict):
|
||||
(VariableHeadGuidIndex, VariableHeadStringIndex, SKUVariableOffset, VariableOffset, VariableRefTable, VariableAttribute) = VariableEntryPerSku[:]
|
||||
DbIndex = 0
|
||||
DbOffset = FixedHeaderLen
|
||||
for DbIndex in xrange(len(DbTotal)):
|
||||
for DbIndex in range(len(DbTotal)):
|
||||
if DbTotal[DbIndex] is VariableRefTable:
|
||||
DbOffset += DbItemTotal[DbIndex].GetInterOffset(VariableOffset)
|
||||
break
|
||||
@ -760,7 +760,7 @@ def BuildExDataBase(Dict):
|
||||
|
||||
# calculate various table offset now
|
||||
DbTotalLength = FixedHeaderLen
|
||||
for DbIndex in xrange(len(DbItemTotal)):
|
||||
for DbIndex in range(len(DbItemTotal)):
|
||||
if DbItemTotal[DbIndex] is DbLocalTokenNumberTable:
|
||||
LocalTokenNumberTableOffset = DbTotalLength
|
||||
elif DbItemTotal[DbIndex] is DbExMapTable:
|
||||
|
Reference in New Issue
Block a user