1 files changed, 6 insertions, 5 deletions

diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Source/Python/Common/VpdInfoFile.py
index 3fadd693ea..0485bf482e 100644
--- a/BaseTools/Source/Python/Common/VpdInfoFile.py
+++ b/BaseTools/Source/Python/Common/VpdInfoFile.py
@@ -15,6 +15,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 print_function

 import Common.LongFilePathOs as os

 import re

 import Common.EdkLogger as EdkLogger

@@ -91,18 +92,18 @@ class VpdInfoFile:
         if (Vpd is None):

             EdkLogger.error("VpdInfoFile", BuildToolError.ATTRIBUTE_UNKNOWN_ERROR, "Invalid VPD PCD entry.")

 

-        if not (Offset >= "0" or Offset == "*"):

+        if not (Offset >= 0 or Offset == "*"):

             EdkLogger.error("VpdInfoFile", BuildToolError.PARAMETER_INVALID, "Invalid offset parameter: %s." % Offset)

 

         if Vpd.DatumType == TAB_VOID:

-            if Vpd.MaxDatumSize <= "0":

+            if Vpd.MaxDatumSize <= 0:

                 EdkLogger.error("VpdInfoFile", BuildToolError.PARAMETER_INVALID,

                                 "Invalid max datum size for VPD PCD %s.%s" % (Vpd.TokenSpaceGuidCName, Vpd.TokenCName))

         elif Vpd.DatumType in TAB_PCD_NUMERIC_TYPES:

             if not Vpd.MaxDatumSize:

                 Vpd.MaxDatumSize = MAX_SIZE_TYPE[Vpd.DatumType]

         else:

-            if Vpd.MaxDatumSize <= "0":

+            if Vpd.MaxDatumSize <= 0:

                 EdkLogger.error("VpdInfoFile", BuildToolError.PARAMETER_INVALID,

                                 "Invalid max datum size for VPD PCD %s.%s" % (Vpd.TokenSpaceGuidCName, Vpd.TokenCName))

 

@@ -126,7 +127,7 @@ class VpdInfoFile:
                             "Invalid parameter FilePath: %s." % FilePath)

 

         Content = FILE_COMMENT_TEMPLATE

-        Pcds = sorted(self._VpdArray.keys(), key=lambda x: x.TokenCName)

+        Pcds = sorted(self._VpdArray.keys())

         for Pcd in Pcds:

             i = 0

             PcdTokenCName = Pcd.TokenCName

@@ -248,7 +249,7 @@ def CallExtenalBPDGTool(ToolPath, VpdFileName):
     except Exception as X:

         EdkLogger.error("BPDG", BuildToolError.COMMAND_FAILURE, ExtraData=str(X))

     (out, error) = PopenObject.communicate()

-    print(out.decode(encoding='utf-8', errors='ignore'))

+    print(out)

     while PopenObject.returncode is None :

         PopenObject.wait()