BaseTools: Handle the bytes and str difference

[mirror_edk2.git] / BaseTools / Source / Python / BPDG / GenVpd.py

diff --git a/BaseTools/Source/Python/BPDG/GenVpd.py b/BaseTools/Source/Python/BPDG/GenVpd.py
index b4a2dd25a260bbe4e57d64ce8b490c5f3c6ed511..09712be3861309f443da9592855126aa9d360e5b 100644 (file)
--- a/BaseTools/Source/Python/BPDG/GenVpd.py
+++ b/BaseTools/Source/Python/BPDG/GenVpd.py
@@ -186,7 +186,7 @@ class PcdEntry:
             EdkLogger.error("BPDG", BuildToolError.RESOURCE_OVERFLOW,\r
                             "PCD value string %s is exceed to size %d(File: %s Line: %s)" % (ValueString, Size, self.FileName, self.Lineno))\r
         try:\r
-            self.PcdValue = pack('%ds' % Size, ValueString)\r
+            self.PcdValue = pack('%ds' % Size, ValueString.encode('utf-8'))\r
         except:\r
             EdkLogger.error("BPDG", BuildToolError.FORMAT_INVALID,\r
                             "Invalid size or value for PCD %s to pack(File: %s Line: %s)." % (self.PcdCName, self.FileName, self.Lineno))\r
@@ -306,7 +306,7 @@ class GenVPD :
         self.PcdFixedOffsetSizeList  = []\r
         self.PcdUnknownOffsetList    = []\r
         try:\r
-            fInputfile = open(InputFileName, "r", 0)\r
+            fInputfile = open(InputFileName, "r")\r
             try:\r
                 self.FileLinesList = fInputfile.readlines()\r
             except:\r
@@ -645,7 +645,7 @@ class GenVPD :
         #Open an VPD file to process\r
 \r
         try:\r
-            fVpdFile = open(BinFileName, "wb", 0)\r
+            fVpdFile = open(BinFileName, "wb")\r
         except:\r
             # Open failed\r
             EdkLogger.error("BPDG", BuildToolError.FILE_OPEN_FAILURE, "File open failed for %s" % self.VpdFileName, None)\r
@@ -657,7 +657,7 @@ class GenVPD :
             EdkLogger.error("BPDG", BuildToolError.FILE_OPEN_FAILURE, "File open failed for %s" % self.MapFileName, None)\r
 \r
         # Use a instance of BytesIO to cache data\r
-        fStringIO = BytesIO('')\r
+        fStringIO = BytesIO()\r
 \r
         # Write the header of map file.\r
         try :\r