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>

diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
index fff717d579257367712b76429a09ab90dd0fb117..f99d9f5d18e10e4a4ccb35e4ed52fff69943d928 100644 (file)
--- 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\r
             #\r
             assert(Index < len(self.RawDataList))\r
-            for ItemIndex in xrange(Index):\r
+            for ItemIndex in range(Index):\r
                 Offset += len(self.RawDataList[ItemIndex])\r
         else:\r
             Offset = self.ItemSize * Index\r
@@ -344,7 +344,7 @@ class DbComItemList (DbItemList):
             assert(False)\r
         else:\r
             assert(Index < len(self.RawDataList))\r
-            for ItemIndex in xrange(Index):\r
+            for ItemIndex in range(Index):\r
                 Offset += len(self.RawDataList[ItemIndex]) * self.ItemSize\r
 \r
         return Offset\r
@@ -410,7 +410,7 @@ class DbStringHeadTableItemList(DbItemList):
             # Variable length, need to calculate one by one\r
             #\r
             assert(Index < len(self.RawDataList))\r
-            for ItemIndex in xrange(Index):\r
+            for ItemIndex in range(Index):\r
                 Offset += len(self.RawDataList[ItemIndex])\r
         else:\r
             for innerIndex in range(Index):\r
@@ -494,14 +494,14 @@ class DbStringItemList (DbComItemList):
         assert(len(RawDataList) == len(LenList))\r
         DataList = []\r
         # adjust DataList according to the LenList\r
-        for Index in xrange(len(RawDataList)):\r
+        for Index in range(len(RawDataList)):\r
             Len = LenList[Index]\r
             RawDatas = RawDataList[Index]\r
             assert(Len >= len(RawDatas))\r
             ActualDatas = []\r
-            for i in xrange(len(RawDatas)):\r
+            for i in range(len(RawDatas)):\r
                 ActualDatas.append(RawDatas[i])\r
-            for i in xrange(len(RawDatas), Len):\r
+            for i in range(len(RawDatas), Len):\r
                 ActualDatas.append(0)\r
             DataList.append(ActualDatas)\r
         self.LenList = LenList\r
@@ -510,7 +510,7 @@ class DbStringItemList (DbComItemList):
         Offset = 0\r
 \r
         assert(Index < len(self.LenList))\r
-        for ItemIndex in xrange(Index):\r
+        for ItemIndex in range(Index):\r
             Offset += self.LenList[ItemIndex]\r
 \r
         return Offset\r
@@ -698,7 +698,7 @@ def BuildExDataBase(Dict):
 \r
     # Get offset of SkuId table in the database\r
     SkuIdTableOffset = FixedHeaderLen\r
-    for DbIndex in xrange(len(DbTotal)):\r
+    for DbIndex in range(len(DbTotal)):\r
         if DbTotal[DbIndex] is SkuidValue:\r
             break\r
         SkuIdTableOffset += DbItemTotal[DbIndex].GetListSize()\r
@@ -710,7 +710,7 @@ def BuildExDataBase(Dict):
     for (LocalTokenNumberTableIndex, (Offset, Table)) in enumerate(LocalTokenNumberTable):\r
         DbIndex = 0\r
         DbOffset = FixedHeaderLen\r
-        for DbIndex in xrange(len(DbTotal)):\r
+        for DbIndex in range(len(DbTotal)):\r
             if DbTotal[DbIndex] is Table:\r
                 DbOffset += DbItemTotal[DbIndex].GetInterOffset(Offset)\r
                 break\r
@@ -736,7 +736,7 @@ def BuildExDataBase(Dict):
             (VariableHeadGuidIndex, VariableHeadStringIndex, SKUVariableOffset, VariableOffset, VariableRefTable, VariableAttribute) = VariableEntryPerSku[:]\r
             DbIndex = 0\r
             DbOffset = FixedHeaderLen\r
-            for DbIndex in xrange(len(DbTotal)):\r
+            for DbIndex in range(len(DbTotal)):\r
                 if DbTotal[DbIndex] is VariableRefTable:\r
                     DbOffset += DbItemTotal[DbIndex].GetInterOffset(VariableOffset)\r
                     break\r
@@ -756,7 +756,7 @@ def BuildExDataBase(Dict):
 \r
     # calculate various table offset now\r
     DbTotalLength = FixedHeaderLen\r
-    for DbIndex in xrange(len(DbItemTotal)):\r
+    for DbIndex in range(len(DbItemTotal)):\r
         if DbItemTotal[DbIndex] is DbLocalTokenNumberTable:\r
             LocalTokenNumberTableOffset = DbTotalLength\r
         elif DbItemTotal[DbIndex] is DbExMapTable:\r

diff --git a/BaseTools/Source/Python/AutoGen/GenVar.py b/BaseTools/Source/Python/AutoGen/GenVar.py
index 036f00e2bbb104337b5d2642c593c2664a28183b..f7806b1dd3565f5c00fa6c1daa0ff51066c04dcc 100644 (file)
--- 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]\r
             if offset > len(BaseValue) or (offset + len(value_list) > len(BaseValue)):\r
                 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))))\r
-            for i in xrange(len(value_list)):\r
+            for i in range(len(value_list)):\r
                 BaseValue[offset + i] = value_list[i]\r
         newvaluestr =  "{" + ",".join(BaseValue) +"}"\r
         return newvaluestr\r
@@ -129,7 +129,7 @@ class VariableMgr(object):
         for current_valuedict_key in ordered_valuedict_keys:\r
             if current_valuedict_key < len(var_value):\r
                 raise\r
-            for _ in xrange(current_valuedict_key - len(var_value)):\r
+            for _ in range(current_valuedict_key - len(var_value)):\r
                 var_value.append('0x00')\r
             var_value += valuedict[current_valuedict_key]\r
         return var_value\r

diff --git a/BaseTools/Source/Python/BPDG/GenVpd.py b/BaseTools/Source/Python/BPDG/GenVpd.py
index 5dcd422f8bf594ef2c6666a5dbbbc20fe0f6a37c..366fac095b69930f160dea0654181b88e509c3a9 100644 (file)
--- a/BaseTools/Source/Python/BPDG/GenVpd.py
+++ b/BaseTools/Source/Python/BPDG/GenVpd.py
@@ -211,7 +211,7 @@ class PcdEntry:
 \r
         ReturnArray = array.array('B')\r
 \r
-        for Index in xrange(len(ValueList)):\r
+        for Index in range(len(ValueList)):\r
             Value = None\r
             if ValueList[Index].lower().startswith('0x'):\r
                 # translate hex value\r
@@ -237,7 +237,7 @@ class PcdEntry:
 \r
             ReturnArray.append(Value)\r
 \r
-        for Index in xrange(len(ValueList), Size):\r
+        for Index in range(len(ValueList), Size):\r
             ReturnArray.append(0)\r
 \r
         self.PcdValue = ReturnArray.tolist()\r
@@ -272,7 +272,7 @@ class PcdEntry:
                                 "Invalid unicode character %s in unicode string %s(File: %s Line: %s)" % \\r
                                 (Value, UnicodeString, self.FileName, self.Lineno))\r
 \r
-        for Index in xrange(len(UnicodeString) * 2, Size):\r
+        for Index in range(len(UnicodeString) * 2, Size):\r
             ReturnArray.append(0)\r
 \r
         self.PcdValue = ReturnArray.tolist()\r

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 5e7b163939e9262f8764dcde0bd8f3f86fae4b52..502f607f8d8c4e9adb125402ef72d2a7fa4ec51a 100644 (file)
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1634,7 +1634,7 @@ def SplitOption(OptionString):
 def CommonPath(PathList):\r
     P1 = min(PathList).split(os.path.sep)\r
     P2 = max(PathList).split(os.path.sep)\r
-    for Index in xrange(min(len(P1), len(P2))):\r
+    for Index in range(min(len(P1), len(P2))):\r
         if P1[Index] != P2[Index]:\r
             return os.path.sep.join(P1[:Index])\r
     return os.path.sep.join(P1)\r

diff --git a/BaseTools/Source/Python/GenFds/Region.py b/BaseTools/Source/Python/GenFds/Region.py
index 457861fa570ea1be1f06fe3aef2191768e2534b5..61c9e182a891f49c32ed553a580886c2f84fbae9 100644 (file)
--- 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)\r
             else:\r
                 PadByte = pack('B', 0)\r
-            PadData = ''.join(PadByte for i in xrange(0, Size))\r
+            PadData = ''.join(PadByte for i in range(0, Size))\r
             Buffer.write(PadData)\r
 \r
     ## AddToBuffer()\r