Revert BaseTools: PYTHON3 migration

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / ValidCheckingInfoObject.py

diff --git a/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py b/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py
index 77518fc1cc1e107a304b174ad561d4f7ac8f6121..edd40a1498ffd4ffc8c5d6247d087479127c22d1 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py
+++ b/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py
@@ -41,7 +41,7 @@ class VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER(object):
             os.mkdir(dest)\r
         BinFileName = "PcdVarCheck.bin"\r
         BinFilePath = os.path.join(dest, BinFileName)\r
-        Buffer = bytearray()\r
+        Buffer = ''\r
         index = 0\r
         for var_check_tab in self.var_check_info:\r
             index += 1\r
@@ -57,7 +57,7 @@ class VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER(object):
                 itemIndex += 1\r
                 realLength += 5\r
                 for v_data in item.data:\r
-                    if isinstance(v_data, int):\r
+                    if type(v_data) in (int, long):\r
                         realLength += item.StorageWidth\r
                     else:\r
                         realLength += item.StorageWidth\r
@@ -137,7 +137,7 @@ class VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER(object):
                 Buffer += b\r
                 realLength += 1\r
                 for v_data in item.data:\r
-                    if isinstance(v_data, int):\r
+                    if type(v_data) in (int, long):\r
                         b = pack(PACK_CODE_BY_SIZE[item.StorageWidth], v_data)\r
                         Buffer += b\r
                         realLength += item.StorageWidth\r
@@ -241,7 +241,7 @@ class VAR_CHECK_PCD_VALID_OBJ(object):
 \r
 class VAR_CHECK_PCD_VALID_LIST(VAR_CHECK_PCD_VALID_OBJ):\r
     def __init__(self, VarOffset, validlist, PcdDataType):\r
-        super().__init__(VarOffset, validlist, PcdDataType)\r
+        super(VAR_CHECK_PCD_VALID_LIST, self).__init__(VarOffset, validlist, PcdDataType)\r
         self.Type = 1\r
         valid_num_list = []\r
         for item in self.rawdata:\r
@@ -261,7 +261,7 @@ class VAR_CHECK_PCD_VALID_LIST(VAR_CHECK_PCD_VALID_OBJ):
 \r
 class VAR_CHECK_PCD_VALID_RANGE(VAR_CHECK_PCD_VALID_OBJ):\r
     def __init__(self, VarOffset, validrange, PcdDataType):\r
-        super().__init__(VarOffset, validrange, PcdDataType)\r
+        super(VAR_CHECK_PCD_VALID_RANGE, self).__init__(VarOffset, validrange, PcdDataType)\r
         self.Type = 2\r
         RangeExpr = ""\r
         i = 0\r