BaseTools: Rename xrange() to range()

Because the xrange() 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>

5 files changed, 18 insertions, 18 deletions

diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
index fff717d579..f99d9f5d18 100644
--- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py
+++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
@@ -257,7 +257,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

@@ -344,7 +344,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

@@ -410,7 +410,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):

@@ -494,14 +494,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

@@ -510,7 +510,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

@@ -698,7 +698,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()

@@ -710,7 +710,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

@@ -736,7 +736,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

@@ -756,7 +756,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:

diff --git a/BaseTools/Source/Python/AutoGen/GenVar.py b/BaseTools/Source/Python/AutoGen/GenVar.py
index 036f00e2bb..f7806b1dd3 100644
--- a/BaseTools/Source/Python/AutoGen/GenVar.py
+++ b/BaseTools/Source/Python/AutoGen/GenVar.py
@@ -93,7 +93,7 @@ class VariableMgr(object):
             value_list,itemPcdname,itemPcdDscLine = newvalue[offset]

             if offset > len(BaseValue) or (offset + len(value_list) > len(BaseValue)):

                 EdkLogger.error("build", AUTOGEN_ERROR, "The EFI Variable referred by PCD %s in line %s exceeds variable size: %s\n" % (itemPcdname,itemPcdDscLine,hex(len(BaseValue))))

-            for i in xrange(len(value_list)):

+            for i in range(len(value_list)):

                 BaseValue[offset + i] = value_list[i]

         newvaluestr =  "{" + ",".join(BaseValue) +"}"

         return newvaluestr

@@ -129,7 +129,7 @@ class VariableMgr(object):
         for current_valuedict_key in ordered_valuedict_keys:

             if current_valuedict_key < len(var_value):

                 raise

-            for _ in xrange(current_valuedict_key - len(var_value)):

+            for _ in range(current_valuedict_key - len(var_value)):

                 var_value.append('0x00')

             var_value += valuedict[current_valuedict_key]

         return var_value

diff --git a/BaseTools/Source/Python/BPDG/GenVpd.py b/BaseTools/Source/Python/BPDG/GenVpd.py
index 5dcd422f8b..366fac095b 100644
--- a/BaseTools/Source/Python/BPDG/GenVpd.py
+++ b/BaseTools/Source/Python/BPDG/GenVpd.py
@@ -211,7 +211,7 @@ class PcdEntry:
 

         ReturnArray = array.array('B')

 

-        for Index in xrange(len(ValueList)):

+        for Index in range(len(ValueList)):

             Value = None

             if ValueList[Index].lower().startswith('0x'):

                 # translate hex value

@@ -237,7 +237,7 @@ class PcdEntry:
 

             ReturnArray.append(Value)

 

-        for Index in xrange(len(ValueList), Size):

+        for Index in range(len(ValueList), Size):

             ReturnArray.append(0)

 

         self.PcdValue = ReturnArray.tolist()

@@ -272,7 +272,7 @@ class PcdEntry:
                                 "Invalid unicode character %s in unicode string %s(File: %s Line: %s)" % \

                                 (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)

 

         self.PcdValue = ReturnArray.tolist()

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 5e7b163939..502f607f8d 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1634,7 +1634,7 @@ def SplitOption(OptionString):
 def CommonPath(PathList):

     P1 = min(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]:

             return os.path.sep.join(P1[:Index])

     return os.path.sep.join(P1)

diff --git a/BaseTools/Source/Python/GenFds/Region.py b/BaseTools/Source/Python/GenFds/Region.py
index 457861fa57..61c9e182a8 100644
--- a/BaseTools/Source/Python/GenFds/Region.py
+++ b/BaseTools/Source/Python/GenFds/Region.py
@@ -57,7 +57,7 @@ class Region(RegionClassObject):
                 PadByte = pack('B', 0xFF)

             else:

                 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)

 

     ## AddToBuffer()