BaseTools: Replace StandardError with Expression

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / GenFds.py

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index e17affc0960e475af037e1d364dfc59176332c5e..1552ab4ee3a8aa74a0def9f25a95b5be72be1850 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -15,6 +15,7 @@
 ##\r
 # Import Modules\r
 #\r
+from __future__ import print_function\r
 from optparse import OptionParser\r
 import sys\r
 import Common.LongFilePathOs as os\r
@@ -32,7 +33,7 @@ import Common.ToolDefClassObject as ToolDefClassObject
 from Common.DataType import *\r
 import Common.GlobalData as GlobalData\r
 from Common import EdkLogger\r
-from Common.String import *\r
+from Common.StringUtils import *\r
 from Common.Misc import DirCache, PathClass\r
 from Common.Misc import SaveFileOnChange\r
 from Common.Misc import ClearDuplicatedInf\r
@@ -335,10 +336,10 @@ def main():
         """Display FV space info."""\r
         GenFds.DisplayFvSpaceInfo(FdfParserObj)\r
 \r
-    except FdfParser.Warning, X:\r
+    except FdfParser.Warning as X:\r
         EdkLogger.error(X.ToolName, FORMAT_INVALID, File=X.FileName, Line=X.LineNumber, ExtraData=X.Message, RaiseError=False)\r
         ReturnCode = FORMAT_INVALID\r
-    except FatalError, X:\r
+    except FatalError as X:\r
         if Options.debug is not None:\r
             import traceback\r
             EdkLogger.quiet(traceback.format_exc())\r
@@ -689,7 +690,7 @@ class GenFds :
         ModuleDict = BuildDb.BuildObject[DscFile, TAB_COMMON, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag].Modules\r
         for Key in ModuleDict:\r
             ModuleObj = BuildDb.BuildObject[Key, TAB_COMMON, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r
-            print ModuleObj.BaseName + ' ' + ModuleObj.ModuleType\r
+            print(ModuleObj.BaseName + ' ' + ModuleObj.ModuleType)\r
 \r
     def GenerateGuidXRefFile(BuildDb, ArchList, FdfParserObj):\r
         GuidXRefFileName = os.path.join(GenFdsGlobalVariable.FvDir, "Guid.xref")\r
@@ -761,7 +762,7 @@ class GenFds :
                                     length = F.tell()\r
                                     F.seek(4)\r
                                     TmpStr = unpack('%dh' % ((length - 4) / 2), F.read())\r
-                                    Name = ''.join([chr(c) for c in TmpStr[:-1]])\r
+                                    Name = ''.join(chr(c) for c in TmpStr[:-1])\r
                         else:\r
                             FileList = []\r
                             if 'fv.sec.txt' in MatchDict:\r