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>

diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
index a9068d2d7a8674d5b975713b1c97e41c4ee7001a..d3e85293d25f520b311be108d8e78a0ea6d2e967 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py
+++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
@@ -261,7 +261,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
@@ -348,7 +348,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
@@ -414,7 +414,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
@@ -498,14 +498,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
@@ -514,7 +514,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
@@ -702,7 +702,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
@@ -714,7 +714,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
@@ -740,7 +740,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
@@ -760,7 +760,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/BPDG/GenVpd.py b/BaseTools/Source/Python/BPDG/GenVpd.py
index e5da47f95e63b10737aa9287ebf65c1fc19175d6..b91837d3d6351d3af9d02d62bfb82269607b92d4 100644 (file)
--- a/BaseTools/Source/Python/BPDG/GenVpd.py
+++ b/BaseTools/Source/Python/BPDG/GenVpd.py
@@ -212,7 +212,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
@@ -238,7 +238,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
@@ -273,7 +273,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 0b4dd7a7c1626915cd1174071a6fdc7093a7e65c..01bd62a9e2df45dd44ae70e208a6092adb95d0ab 100644 (file)
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1448,7 +1448,7 @@ def CheckPcdDatum(Type, Value):
 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 8ca61254b01f9e2676e3f668f14fea61fcd481fb..acc9dea41349111d1d7e220c4ae4bd5a7455bdd5 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Region.py
+++ b/BaseTools/Source/Python/GenFds/Region.py
@@ -62,7 +62,7 @@ class Region(object):
                 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