BaseTools: Enable structure pcd in FDF file

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

diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
index 54b6fb22a08ad6881b78f9d5ec7fb8250e430176..384f31b165de08222f36e8f5330549ec7182da7e 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
@@ -16,12 +16,13 @@
 ##\r
 # Import Modules\r
 #\r
+from __future__ import print_function\r
 import Common.LongFilePathOs as os, codecs, re\r
 import distutils.util\r
 import Common.EdkLogger as EdkLogger\r
-import StringIO\r
+from io import BytesIO\r
 from Common.BuildToolError import *\r
-from Common.String import GetLineNo\r
+from Common.StringUtils import GetLineNo\r
 from Common.Misc import PathClass\r
 from Common.LongFilePathSupport import LongFilePath\r
 from Common.GlobalData import *\r
@@ -254,7 +255,7 @@ class UniFileClassObject(object):
         if len(Lang) != 3:\r
             try:\r
                 FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path))\r
-            except UnicodeError, X:\r
+            except UnicodeError as X:\r
                 EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File);\r
             except:\r
                 EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=File);\r
@@ -283,7 +284,7 @@ class UniFileClassObject(object):
         if not IsLangInDef:\r
             #\r
             # The found STRING tokens will be added into new language string list\r
-            # so that the unique STRING identifier is reserved for all languages in the package list. \r
+            # so that the unique STRING identifier is reserved for all languages in the package list.\r
             #\r
             FirstLangName = self.LanguageDef[0][0]\r
             if LangName != FirstLangName:\r
@@ -319,7 +320,7 @@ class UniFileClassObject(object):
 \r
         UniFileClassObject.VerifyUcs2Data(FileIn, FileName, Encoding)\r
 \r
-        UniFile = StringIO.StringIO(FileIn)\r
+        UniFile = BytesIO(FileIn)\r
         Info = codecs.lookup(Encoding)\r
         (Reader, Writer) = (Info.streamreader, Info.streamwriter)\r
         return codecs.StreamReaderWriter(UniFile, Reader, Writer)\r
@@ -334,7 +335,7 @@ class UniFileClassObject(object):
             FileDecoded = codecs.decode(FileIn, Encoding)\r
             Ucs2Info.encode(FileDecoded)\r
         except:\r
-            UniFile = StringIO.StringIO(FileIn)\r
+            UniFile = BytesIO(FileIn)\r
             Info = codecs.lookup(Encoding)\r
             (Reader, Writer) = (Info.streamreader, Info.streamwriter)\r
             File = codecs.StreamReaderWriter(UniFile, Reader, Writer)\r
@@ -393,7 +394,7 @@ class UniFileClassObject(object):
 \r
         try:\r
             FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path))\r
-        except UnicodeError, X:\r
+        except UnicodeError as X:\r
             EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File.Path);\r
         except:\r
             EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=File.Path);\r
@@ -410,10 +411,10 @@ class UniFileClassObject(object):
             #\r
             # Ignore empty line\r
             #\r
-            if len(Line) == 0: \r
-                continue \r
-            \r
-                             \r
+            if len(Line) == 0:\r
+                continue\r
+\r
+\r
             Line = Line.replace(u'/langdef', u'#langdef')\r
             Line = Line.replace(u'/string', u'#string')\r
             Line = Line.replace(u'/language', u'#language')\r
@@ -428,8 +429,8 @@ class UniFileClassObject(object):
             Line = Line.replace(u'\\r', CR)\r
             Line = Line.replace(u'\\t', u' ')\r
             Line = Line.replace(u'\t', u' ')\r
-            Line = Line.replace(u'\\"', u'"') \r
-            Line = Line.replace(u"\\'", u"'") \r
+            Line = Line.replace(u'\\"', u'"')\r
+            Line = Line.replace(u"\\'", u"'")\r
             Line = Line.replace(BACK_SLASH_PLACEHOLDER, u'\\')\r
 \r
             StartPos = Line.find(u'\\x')\r
@@ -569,7 +570,7 @@ class UniFileClassObject(object):
         else:\r
             EdkLogger.error('Unicode File Parser', FORMAT_NOT_SUPPORTED, "The language '%s' for %s is not defined in Unicode file %s." \\r
                             % (Language, Name, self.File))\r
-            \r
+\r
         if Language not in self.OrderedStringList:\r
             self.OrderedStringList[Language] = []\r
             self.OrderedStringDict[Language] = {}\r
@@ -591,7 +592,7 @@ class UniFileClassObject(object):
                 for LangName in self.LanguageDef:\r
                     #\r
                     # New STRING token will be added into all language string lists.\r
-                    # so that the unique STRING identifier is reserved for all languages in the package list. \r
+                    # so that the unique STRING identifier is reserved for all languages in the package list.\r
                     #\r
                     if LangName[0] != Language:\r
                         if UseOtherLangDef != '':\r
@@ -684,12 +685,12 @@ class UniFileClassObject(object):
     # Show the instance itself\r
     #\r
     def ShowMe(self):\r
-        print self.LanguageDef\r
+        print(self.LanguageDef)\r
         #print self.OrderedStringList\r
         for Item in self.OrderedStringList:\r
-            print Item\r
+            print(Item)\r
             for Member in self.OrderedStringList[Item]:\r
-                print str(Member)\r
+                print(str(Member))\r
 \r
 # This acts like the main() function for the script, unless it is 'import'ed into another\r
 # script.\r