tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-30 00:54:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

BaseTool:Rename xrange() to range()

Browse Source 
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:
Zhijux Fan 2018-11-28 09:26:06 +08:00 committed by Feng, Bob C
parent cc01b26e05
commit e77e59c9bd
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
BaseTools/Source/Python/AutoGen/GenPcdDb.py
View File

@ -261,7 +261,7 @@ class DbItemList:
# Variable length, need to calculate one by one # Variable length, need to calculate one by one
# #
assert(Index < len(self.RawDataList)) assert(Index < len(self.RawDataList))
for ItemIndex in xrange(Index): for ItemIndex in range(Index):
Offset += len(self.RawDataList[ItemIndex]) Offset += len(self.RawDataList[ItemIndex])
else: else:
Offset = self.ItemSize * Index Offset = self.ItemSize * Index
@ -348,7 +348,7 @@ class DbComItemList (DbItemList):
assert(False) assert(False)
else: else:
assert(Index < len(self.RawDataList)) assert(Index < len(self.RawDataList))
for ItemIndex in xrange(Index): for ItemIndex in range(Index):
Offset += len(self.RawDataList[ItemIndex]) * self.ItemSize Offset += len(self.RawDataList[ItemIndex]) * self.ItemSize
return Offset return Offset
@ -414,7 +414,7 @@ class DbStringHeadTableItemList(DbItemList):
# Variable length, need to calculate one by one # Variable length, need to calculate one by one
# #
assert(Index < len(self.RawDataList)) assert(Index < len(self.RawDataList))
for ItemIndex in xrange(Index): for ItemIndex in range(Index):
Offset += len(self.RawDataList[ItemIndex]) Offset += len(self.RawDataList[ItemIndex])
else: else:
for innerIndex in range(Index): for innerIndex in range(Index):
@ -498,14 +498,14 @@ class DbStringItemList (DbComItemList):
assert(len(RawDataList) == len(LenList)) assert(len(RawDataList) == len(LenList))
DataList = [] DataList = []
# adjust DataList according to the LenList # adjust DataList according to the LenList
for Index in xrange(len(RawDataList)): for Index in range(len(RawDataList)):
Len = LenList[Index] Len = LenList[Index]
RawDatas = RawDataList[Index] RawDatas = RawDataList[Index]
assert(Len >= len(RawDatas)) assert(Len >= len(RawDatas))
ActualDatas = [] ActualDatas = []
for i in xrange(len(RawDatas)): for i in range(len(RawDatas)):
ActualDatas.append(RawDatas[i]) ActualDatas.append(RawDatas[i])
for i in xrange(len(RawDatas), Len): for i in range(len(RawDatas), Len):
ActualDatas.append(0) ActualDatas.append(0)
DataList.append(ActualDatas) DataList.append(ActualDatas)
self.LenList = LenList self.LenList = LenList
@ -514,7 +514,7 @@ class DbStringItemList (DbComItemList):
Offset = 0 Offset = 0
assert(Index < len(self.LenList)) assert(Index < len(self.LenList))
for ItemIndex in xrange(Index): for ItemIndex in range(Index):
Offset += self.LenList[ItemIndex] Offset += self.LenList[ItemIndex]
return Offset return Offset
@ -702,7 +702,7 @@ def BuildExDataBase(Dict):
# Get offset of SkuId table in the database # Get offset of SkuId table in the database
SkuIdTableOffset = FixedHeaderLen SkuIdTableOffset = FixedHeaderLen
for DbIndex in xrange(len(DbTotal)): for DbIndex in range(len(DbTotal)):
if DbTotal[DbIndex] is SkuidValue: if DbTotal[DbIndex] is SkuidValue:
break break
SkuIdTableOffset += DbItemTotal[DbIndex].GetListSize() SkuIdTableOffset += DbItemTotal[DbIndex].GetListSize()
@ -714,7 +714,7 @@ def BuildExDataBase(Dict):
for (LocalTokenNumberTableIndex, (Offset, Table)) in enumerate(LocalTokenNumberTable): for (LocalTokenNumberTableIndex, (Offset, Table)) in enumerate(LocalTokenNumberTable):
DbIndex = 0 DbIndex = 0
DbOffset = FixedHeaderLen DbOffset = FixedHeaderLen
for DbIndex in xrange(len(DbTotal)): for DbIndex in range(len(DbTotal)):
if DbTotal[DbIndex] is Table: if DbTotal[DbIndex] is Table:
DbOffset += DbItemTotal[DbIndex].GetInterOffset(Offset) DbOffset += DbItemTotal[DbIndex].GetInterOffset(Offset)
break break
@ -740,7 +740,7 @@ def BuildExDataBase(Dict):
(VariableHeadGuidIndex, VariableHeadStringIndex, SKUVariableOffset, VariableOffset, VariableRefTable, VariableAttribute) = VariableEntryPerSku[:] (VariableHeadGuidIndex, VariableHeadStringIndex, SKUVariableOffset, VariableOffset, VariableRefTable, VariableAttribute) = VariableEntryPerSku[:]
DbIndex = 0 DbIndex = 0
DbOffset = FixedHeaderLen DbOffset = FixedHeaderLen
for DbIndex in xrange(len(DbTotal)): for DbIndex in range(len(DbTotal)):
if DbTotal[DbIndex] is VariableRefTable: if DbTotal[DbIndex] is VariableRefTable:
DbOffset += DbItemTotal[DbIndex].GetInterOffset(VariableOffset) DbOffset += DbItemTotal[DbIndex].GetInterOffset(VariableOffset)
break break
@ -760,7 +760,7 @@ def BuildExDataBase(Dict):
# calculate various table offset now # calculate various table offset now
DbTotalLength = FixedHeaderLen DbTotalLength = FixedHeaderLen
for DbIndex in xrange(len(DbItemTotal)): for DbIndex in range(len(DbItemTotal)):
if DbItemTotal[DbIndex] is DbLocalTokenNumberTable: if DbItemTotal[DbIndex] is DbLocalTokenNumberTable:
LocalTokenNumberTableOffset = DbTotalLength LocalTokenNumberTableOffset = DbTotalLength
elif DbItemTotal[DbIndex] is DbExMapTable: elif DbItemTotal[DbIndex] is DbExMapTable:

6
BaseTools/Source/Python/BPDG/GenVpd.py
View File

@ -212,7 +212,7 @@ class PcdEntry:
ReturnArray = array.array('B') ReturnArray = array.array('B')
for Index in xrange(len(ValueList)): for Index in range(len(ValueList)):
Value = None Value = None
if ValueList[Index].lower().startswith('0x'): if ValueList[Index].lower().startswith('0x'):
# translate hex value # translate hex value
@ -238,7 +238,7 @@ class PcdEntry:
ReturnArray.append(Value) ReturnArray.append(Value)
for Index in xrange(len(ValueList), Size): for Index in range(len(ValueList), Size):
ReturnArray.append(0) ReturnArray.append(0)
self.PcdValue = ReturnArray.tolist() self.PcdValue = ReturnArray.tolist()
@ -273,7 +273,7 @@ class PcdEntry:
"Invalid unicode character %s in unicode string %s(File: %s Line: %s)" % \ "Invalid unicode character %s in unicode string %s(File: %s Line: %s)" % \
(Value, UnicodeString, self.FileName, self.Lineno)) (Value, UnicodeString, self.FileName, self.Lineno))
for Index in xrange(len(UnicodeString) * 2, Size): for Index in range(len(UnicodeString) * 2, Size):
ReturnArray.append(0) ReturnArray.append(0)
self.PcdValue = ReturnArray.tolist() self.PcdValue = ReturnArray.tolist()

2
BaseTools/Source/Python/Common/Misc.py
View File

@ -1448,7 +1448,7 @@ def CheckPcdDatum(Type, Value):
def CommonPath(PathList): def CommonPath(PathList):
P1 = min(PathList).split(os.path.sep) P1 = min(PathList).split(os.path.sep)
P2 = max(PathList).split(os.path.sep) P2 = max(PathList).split(os.path.sep)
for Index in xrange(min(len(P1), len(P2))): for Index in range(min(len(P1), len(P2))):
if P1[Index] != P2[Index]: if P1[Index] != P2[Index]:
return os.path.sep.join(P1[:Index]) return os.path.sep.join(P1[:Index])
return os.path.sep.join(P1) return os.path.sep.join(P1)

2
BaseTools/Source/Python/GenFds/Region.py
View File

@ -62,7 +62,7 @@ class Region(object):
PadByte = pack('B', 0xFF) PadByte = pack('B', 0xFF)
else: else:
PadByte = pack('B', 0) PadByte = pack('B', 0)
PadData = ''.join(PadByte for i in xrange(0, Size)) PadData = ''.join(PadByte for i in range(0, Size))
Buffer.write(PadData) Buffer.write(PadData)
## AddToBuffer() ## AddToBuffer()