BaseTools/BinToPcd: Fix Python 2.7.x compatibility issue

[mirror_edk2.git] / BaseTools / Scripts / BinToPcd.py

diff --git a/BaseTools/Scripts/BinToPcd.py b/BaseTools/Scripts/BinToPcd.py
index b907d3e5e0008e707955bca75aea28d02da2c357..25b74f60049335d57f0878ed69e40fe0c6f0c5d9 100644 (file)
--- a/BaseTools/Scripts/BinToPcd.py
+++ b/BaseTools/Scripts/BinToPcd.py
@@ -14,6 +14,7 @@
 '''\r
 BinToPcd\r
 '''\r
 '''\r
 BinToPcd\r
 '''\r

+from __future__ import print_function\r

 \r
 import sys\r
 import argparse\r
 \r
 import sys\r
 import argparse\r


@@ -40,13 +41,13 @@ if __name__ == '__main__':
         return Value\r
 \r
     def ValidatePcdName (Argument):\r
         return Value\r
 \r
     def ValidatePcdName (Argument):\r

-        if re.split ('[a-zA-Z\_][a-zA-Z0-9\_]*\.[a-zA-Z\_][a-zA-Z0-9\_]*', Argument) != ['','']:\r
+        if re.split ('[a-zA-Z\_][a-zA-Z0-9\_]*\.[a-zA-Z\_][a-zA-Z0-9\_]*', Argument) != ['', '']:\r

             Message = '{Argument} is not in the form <PcdTokenSpaceGuidCName>.<PcdCName>'.format (Argument = Argument)\r
             raise argparse.ArgumentTypeError (Message)\r
         return Argument\r
 \r
     def ValidateGuidName (Argument):\r
             Message = '{Argument} is not in the form <PcdTokenSpaceGuidCName>.<PcdCName>'.format (Argument = Argument)\r
             raise argparse.ArgumentTypeError (Message)\r
         return Argument\r
 \r
     def ValidateGuidName (Argument):\r

-        if re.split ('[a-zA-Z\_][a-zA-Z0-9\_]*', Argument) != ['','']:\r
+        if re.split ('[a-zA-Z\_][a-zA-Z0-9\_]*', Argument) != ['', '']:\r

             Message = '{Argument} is not a valid GUID C name'.format (Argument = Argument)\r
             raise argparse.ArgumentTypeError (Message)\r
         return Argument\r
             Message = '{Argument} is not a valid GUID C name'.format (Argument = Argument)\r
             raise argparse.ArgumentTypeError (Message)\r
         return Argument\r


@@ -65,7 +66,7 @@ if __name__ == '__main__':
             #\r
             # If Xdr flag is not set, then concatenate all the data\r
             #\r
             #\r
             # If Xdr flag is not set, then concatenate all the data\r
             #\r

-            Buffer = b''.join (Buffer)\r
+            Buffer = bytearray (b''.join (Buffer))\r

         #\r
         # Return a PCD value of the form '{0x01, 0x02, ...}' along with the PCD length in bytes\r
         #\r
         #\r
         # Return a PCD value of the form '{0x01, 0x02, ...}' along with the PCD length in bytes\r
         #\r


@@ -83,7 +84,7 @@ if __name__ == '__main__':
                          help = "Output filename for PCD value or PCD statement")\r
     parser.add_argument ("-p", "--pcd", dest = 'PcdName', type = ValidatePcdName,\r
                          help = "Name of the PCD in the form <PcdTokenSpaceGuidCName>.<PcdCName>")\r
                          help = "Output filename for PCD value or PCD statement")\r
     parser.add_argument ("-p", "--pcd", dest = 'PcdName', type = ValidatePcdName,\r
                          help = "Name of the PCD in the form <PcdTokenSpaceGuidCName>.<PcdCName>")\r

-    parser.add_argument ("-t", "--type", dest = 'PcdType', default = None, choices = ['VPD','HII'],\r
+    parser.add_argument ("-t", "--type", dest = 'PcdType', default = None, choices = ['VPD', 'HII'],\r

                          help = "PCD statement type (HII or VPD).  Default is standard.")\r
     parser.add_argument ("-m", "--max-size", dest = 'MaxSize', type = ValidateUnsignedInteger,\r
                          help = "Maximum size of the PCD.  Ignored with --type HII.")\r
                          help = "PCD statement type (HII or VPD).  Default is standard.")\r
     parser.add_argument ("-m", "--max-size", dest = 'MaxSize', type = ValidateUnsignedInteger,\r
                          help = "Maximum size of the PCD.  Ignored with --type HII.")\r