Revert BaseTools: PYTHON3 migration

This reverts commit 6693f359b3c213513c5096a06c6f67244a44dc52..
678f85131238622e576705117e299d81cff755c9.

Python3 migration is the fundamental change. It requires every developer
to install Python3. Before this migration, the well communication and wide
verification must be done. But now, most people is not aware of this change,
and not try it. So, Python3 migration is reverted and be moved to edk2-staging
Python3 branch for the edk2 user evaluation.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>

1 files changed, 27 insertions, 26 deletions

diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
index 68f92ef063..876fcf1efb 100644
--- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py
+++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
@@ -10,6 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

+from __future__ import absolute_import

 from io import BytesIO

 from Common.Misc import *

 from Common.StringUtils import StringToArray

@@ -257,7 +258,7 @@ class DbItemList:
             # Variable length, need to calculate one by one

             #

             assert(Index < len(self.RawDataList))

-            for ItemIndex in range(Index):

+            for ItemIndex in xrange(Index):

                 Offset += len(self.RawDataList[ItemIndex])

         else:

             Offset = self.ItemSize * Index

@@ -291,7 +292,7 @@ class DbItemList:
 

         PackStr = PACK_CODE_BY_SIZE[self.ItemSize]

 

-        Buffer = bytearray()

+        Buffer = ''

         for Datas in self.RawDataList:

             if type(Datas) in (list, tuple):

                 for Data in Datas:

@@ -316,7 +317,7 @@ class DbExMapTblItemList (DbItemList):
         DbItemList.__init__(self, ItemSize, DataList, RawDataList)

 

     def PackData(self):

-        Buffer = bytearray()

+        Buffer = ''

         PackStr = "=LHH"

         for Datas in self.RawDataList:

             Buffer += pack(PackStr,

@@ -344,7 +345,7 @@ class DbComItemList (DbItemList):
             assert(False)

         else:

             assert(Index < len(self.RawDataList))

-            for ItemIndex in range(Index):

+            for ItemIndex in xrange(Index):

                 Offset += len(self.RawDataList[ItemIndex]) * self.ItemSize

 

         return Offset

@@ -365,7 +366,7 @@ class DbComItemList (DbItemList):
     def PackData(self):

         PackStr = PACK_CODE_BY_SIZE[self.ItemSize]

 

-        Buffer = bytearray()

+        Buffer = ''

         for DataList in self.RawDataList:

             for Data in DataList:

                 if type(Data) in (list, tuple):

@@ -386,7 +387,7 @@ class DbVariableTableItemList (DbComItemList):
 

     def PackData(self):

         PackStr = "=LLHHLHH"

-        Buffer = bytearray()

+        Buffer = ''

         for DataList in self.RawDataList:

             for Data in DataList:

                 Buffer += pack(PackStr,

@@ -410,7 +411,7 @@ class DbStringHeadTableItemList(DbItemList):
             # Variable length, need to calculate one by one

             #

             assert(Index < len(self.RawDataList))

-            for ItemIndex in range(Index):

+            for ItemIndex in xrange(Index):

                 Offset += len(self.RawDataList[ItemIndex])

         else:

             for innerIndex in range(Index):

@@ -447,7 +448,7 @@ class DbSkuHeadTableItemList (DbItemList):
 

     def PackData(self):

         PackStr = "=LL"

-        Buffer = bytearray()

+        Buffer = ''

         for Data in self.RawDataList:

             Buffer += pack(PackStr,

                            GetIntegerValue(Data[0]),

@@ -469,7 +470,7 @@ class DbSizeTableItemList (DbItemList):
         return length * self.ItemSize

     def PackData(self):

         PackStr = "=H"

-        Buffer = bytearray()

+        Buffer = ''

         for Data in self.RawDataList:

             Buffer += pack(PackStr,

                            GetIntegerValue(Data[0]))

@@ -494,14 +495,14 @@ class DbStringItemList (DbComItemList):
         assert(len(RawDataList) == len(LenList))

         DataList = []

         # adjust DataList according to the LenList

-        for Index in range(len(RawDataList)):

+        for Index in xrange(len(RawDataList)):

             Len = LenList[Index]

             RawDatas = RawDataList[Index]

             assert(Len >= len(RawDatas))

             ActualDatas = []

-            for i in range(len(RawDatas)):

+            for i in xrange(len(RawDatas)):

                 ActualDatas.append(RawDatas[i])

-            for i in range(len(RawDatas), Len):

+            for i in xrange(len(RawDatas), Len):

                 ActualDatas.append(0)

             DataList.append(ActualDatas)

         self.LenList = LenList

@@ -510,7 +511,7 @@ class DbStringItemList (DbComItemList):
         Offset = 0

 

         assert(Index < len(self.LenList))

-        for ItemIndex in range(Index):

+        for ItemIndex in xrange(Index):

             Offset += self.LenList[ItemIndex]

 

         return Offset

@@ -611,7 +612,7 @@ def BuildExDataBase(Dict):
     DbVardefValueUint32 = DbItemList(4, RawDataList = VardefValueUint32)

     VpdHeadValue = Dict['VPD_DB_VALUE']

     DbVpdHeadValue = DbComItemList(4, RawDataList = VpdHeadValue)

-    ExMapTable = list(zip(Dict['EXMAPPING_TABLE_EXTOKEN'], Dict['EXMAPPING_TABLE_LOCAL_TOKEN'], Dict['EXMAPPING_TABLE_GUID_INDEX']))

+    ExMapTable = zip(Dict['EXMAPPING_TABLE_EXTOKEN'], Dict['EXMAPPING_TABLE_LOCAL_TOKEN'], Dict['EXMAPPING_TABLE_GUID_INDEX'])

     DbExMapTable = DbExMapTblItemList(8, RawDataList = ExMapTable)

     LocalTokenNumberTable = Dict['LOCAL_TOKEN_NUMBER_DB_VALUE']

     DbLocalTokenNumberTable = DbItemList(4, RawDataList = LocalTokenNumberTable)

@@ -645,7 +646,7 @@ def BuildExDataBase(Dict):
     PcdNameOffsetTable = Dict['PCD_NAME_OFFSET']

     DbPcdNameOffsetTable = DbItemList(4, RawDataList = PcdNameOffsetTable)

 

-    SizeTableValue = list(zip(Dict['SIZE_TABLE_MAXIMUM_LENGTH'], Dict['SIZE_TABLE_CURRENT_LENGTH']))

+    SizeTableValue = zip(Dict['SIZE_TABLE_MAXIMUM_LENGTH'], Dict['SIZE_TABLE_CURRENT_LENGTH'])

     DbSizeTableValue = DbSizeTableItemList(2, RawDataList = SizeTableValue)

     InitValueUint16 = Dict['INIT_DB_VALUE_UINT16']

     DbInitValueUint16 = DbComItemList(2, RawDataList = InitValueUint16)

@@ -698,7 +699,7 @@ def BuildExDataBase(Dict):
 

     # Get offset of SkuId table in the database

     SkuIdTableOffset = FixedHeaderLen

-    for DbIndex in range(len(DbTotal)):

+    for DbIndex in xrange(len(DbTotal)):

         if DbTotal[DbIndex] is SkuidValue:

             break

         SkuIdTableOffset += DbItemTotal[DbIndex].GetListSize()

@@ -710,7 +711,7 @@ def BuildExDataBase(Dict):
     for (LocalTokenNumberTableIndex, (Offset, Table)) in enumerate(LocalTokenNumberTable):

         DbIndex = 0

         DbOffset = FixedHeaderLen

-        for DbIndex in range(len(DbTotal)):

+        for DbIndex in xrange(len(DbTotal)):

             if DbTotal[DbIndex] is Table:

                 DbOffset += DbItemTotal[DbIndex].GetInterOffset(Offset)

                 break

@@ -736,7 +737,7 @@ def BuildExDataBase(Dict):
             (VariableHeadGuidIndex, VariableHeadStringIndex, SKUVariableOffset, VariableOffset, VariableRefTable, VariableAttribute) = VariableEntryPerSku[:]

             DbIndex = 0

             DbOffset = FixedHeaderLen

-            for DbIndex in range(len(DbTotal)):

+            for DbIndex in xrange(len(DbTotal)):

                 if DbTotal[DbIndex] is VariableRefTable:

                     DbOffset += DbItemTotal[DbIndex].GetInterOffset(VariableOffset)

                     break

@@ -756,7 +757,7 @@ def BuildExDataBase(Dict):
 

     # calculate various table offset now

     DbTotalLength = FixedHeaderLen

-    for DbIndex in range(len(DbItemTotal)):

+    for DbIndex in xrange(len(DbItemTotal)):

         if DbItemTotal[DbIndex] is DbLocalTokenNumberTable:

             LocalTokenNumberTableOffset = DbTotalLength

         elif DbItemTotal[DbIndex] is DbExMapTable:

@@ -849,7 +850,7 @@ def BuildExDataBase(Dict):
     Index = 0

     for Item in DbItemTotal:

         Index +=1

-        b = bytes(Item.PackData())

+        b = Item.PackData()

         Buffer += b

         if Index == InitTableNum:

             if len(Buffer) % 8:

@@ -917,9 +918,9 @@ def CreatePcdDataBase(PcdDBData):
     totallenbuff = pack("=L", totallen)

     newbuffer = databasebuff[:32]

     for i in range(4):

-        newbuffer += bytes([totallenbuff[i]])

+        newbuffer += totallenbuff[i]

     for i in range(36, totallen):

-        newbuffer += bytes([databasebuff[i]])

+        newbuffer += databasebuff[i]

 

     return newbuffer

 

@@ -962,7 +963,7 @@ def NewCreatePcdDatabasePhaseSpecificAutoGen(Platform, Phase):
             AdditionalAutoGenH, AdditionalAutoGenC, PcdDbBuffer, VarCheckTab = CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdSet_Sku[(skuname, skuid)], Phase)

             final_data = ()

             for item in PcdDbBuffer:

-                final_data += unpack("B", bytes([item]))

+                final_data += unpack("B", item)

             PcdDBData[(skuname, skuid)] = (PcdDbBuffer, final_data)

             PcdDriverAutoGenData[(skuname, skuid)] = (AdditionalAutoGenH, AdditionalAutoGenC)

             VarCheckTableData[(skuname, skuid)] = VarCheckTab

@@ -975,7 +976,7 @@ def NewCreatePcdDatabasePhaseSpecificAutoGen(Platform, Phase):
         AdditionalAutoGenH, AdditionalAutoGenC, PcdDbBuffer, VarCheckTab = CreatePcdDatabasePhaseSpecificAutoGen (Platform, {}, Phase)

         final_data = ()

         for item in PcdDbBuffer:

-            final_data += unpack("B", bytes([item]))

+            final_data += unpack("B", item)

         PcdDBData[(TAB_DEFAULT, "0")] = (PcdDbBuffer, final_data)

 

     return AdditionalAutoGenH, AdditionalAutoGenC, CreatePcdDataBase(PcdDBData)

@@ -1348,7 +1349,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
 

                 DbValueList.append(Sku.DefaultValue)

 

-        Pcd.TokenTypeList = sorted(set(Pcd.TokenTypeList))

+        Pcd.TokenTypeList = list(set(Pcd.TokenTypeList))

         if Pcd.DatumType == TAB_VOID:

             Dict['SIZE_TABLE_CNAME'].append(CName)

             Dict['SIZE_TABLE_GUID'].append(TokenSpaceGuid)

@@ -1449,7 +1450,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
             Dict['PCD_CNAME_LENGTH'][GeneratedTokenNumber] = len(CNameBinArray.split(","))

 

 

-        Pcd.TokenTypeList = sorted(set(Pcd.TokenTypeList))

+        Pcd.TokenTypeList = list(set(Pcd.TokenTypeList))

 

         # search the Offset and Table, used by LocalTokenNumberTableOffset

         if 'PCD_TYPE_HII' in Pcd.TokenTypeList: