BaseTools: Replace StringIO.StringIO with io.BytesIO

[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 b491b68f6e87022b27315750a5d8fbc16d4e9413..49fbdf3246a584fd895ce26f335230e71aad786b 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py
+++ b/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py
@@ -17,7 +17,7 @@
 import os\r
 from Common.RangeExpression import RangeExpression\r
 from Common.Misc import *\r
-from StringIO import StringIO\r
+from io import BytesIO\r
 from struct import pack\r
 from Common.DataType import *\r
 \r
@@ -35,12 +35,6 @@ class VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER(object):
     \r
     def dump(self, dest, Phase):\r
         \r
-        FormatMap = {}\r
-        FormatMap[1] = "=B"\r
-        FormatMap[2] = "=H"\r
-        FormatMap[4] = "=L"\r
-        FormatMap[8] = "=Q"\r
-        \r
         if not os.path.isabs(dest):\r
             return\r
         if not os.path.exists(dest):\r
@@ -106,19 +100,7 @@ class VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER(object):
             realLength += 4\r
 \r
             Guid = var_check_tab.Guid\r
-            b = pack('=LHHBBBBBBBB',\r
-                Guid[0],\r
-                Guid[1],\r
-                Guid[2],\r
-                Guid[3],\r
-                Guid[4],\r
-                Guid[5],\r
-                Guid[6],\r
-                Guid[7],\r
-                Guid[8],\r
-                Guid[9],\r
-                Guid[10],\r
-                )\r
+            b = PackByteFormatGUID(Guid)\r
             Buffer += b\r
             realLength += 16\r
 \r
@@ -156,14 +138,14 @@ class VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER(object):
                 realLength += 1\r
                 for v_data in item.data:\r
                     if type(v_data) in (int, long):\r
-                        b = pack(FormatMap[item.StorageWidth], v_data)\r
+                        b = pack(PACK_CODE_BY_SIZE[item.StorageWidth], v_data)\r
                         Buffer += b\r
                         realLength += item.StorageWidth\r
                     else:\r
-                        b = pack(FormatMap[item.StorageWidth], v_data[0])\r
+                        b = pack(PACK_CODE_BY_SIZE[item.StorageWidth], v_data[0])\r
                         Buffer += b\r
                         realLength += item.StorageWidth\r
-                        b = pack(FormatMap[item.StorageWidth], v_data[1])\r
+                        b = pack(PACK_CODE_BY_SIZE[item.StorageWidth], v_data[1])\r
                         Buffer += b\r
                         realLength += item.StorageWidth\r
 \r
@@ -180,7 +162,7 @@ class VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER(object):
                             Buffer += b\r
                             realLength += 1\r
         \r
-        DbFile = StringIO()\r
+        DbFile = BytesIO()\r
         if Phase == 'DXE' and os.path.exists(BinFilePath):\r
             BinFile = open(BinFilePath, "rb")\r
             BinBuffer = BinFile.read()\r
@@ -295,14 +277,10 @@ class VAR_CHECK_PCD_VALID_RANGE(VAR_CHECK_PCD_VALID_OBJ):
         self.Length = 5 + len(self.data) * 2 * self.StorageWidth\r
         \r
 \r
-class VAR_VALID_OBJECT_FACTORY(object):\r
-    def __init__(self):\r
-        pass\r
-    @staticmethod\r
-    def Get_valid_object(PcdClass, VarOffset):\r
-        if PcdClass.validateranges:\r
-            return VAR_CHECK_PCD_VALID_RANGE(VarOffset, PcdClass.validateranges, PcdClass.DatumType)\r
-        if PcdClass.validlists:\r
-            return VAR_CHECK_PCD_VALID_LIST(VarOffset, PcdClass.validlists, PcdClass.DatumType)\r
-        else:\r
-            return None\r
+def GetValidationObject(PcdClass, VarOffset):\r
+    if PcdClass.validateranges:\r
+        return VAR_CHECK_PCD_VALID_RANGE(VarOffset, PcdClass.validateranges, PcdClass.DatumType)\r
+    if PcdClass.validlists:\r
+        return VAR_CHECK_PCD_VALID_LIST(VarOffset, PcdClass.validlists, PcdClass.DatumType)\r
+    else:\r
+        return None\r