BaseTools: Refactor python except statements

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / InfBuildData.py

diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/Source/Python/Workspace/InfBuildData.py
index 602746de32f7d15ac59525a8ee3c97d44689782b..165e03f78964bc5e8f99350d57fe9b48a34015cf 100644 (file)
--- a/BaseTools/Source/Python/Workspace/InfBuildData.py
+++ b/BaseTools/Source/Python/Workspace/InfBuildData.py
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r
-from Common.String import *\r
+from Common.StringUtils import *\r
 from Common.DataType import *\r
 from Common.Misc import *\r
 from types import *\r
@@ -698,7 +698,7 @@ class InfBuildData(ModuleBuildClassObject):
                 CName = Record[0]\r
                 Value = ProtocolValue(CName, self.Packages, self.MetaFile.Path)\r
                 if Value is None:\r
-                    PackageList = "\n\t".join([str(P) for P in self.Packages])\r
+                    PackageList = "\n\t".join(str(P) for P in self.Packages)\r
                     EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
                                     "Value of Protocol [%s] is not found under [Protocols] section in" % CName,\r
                                     ExtraData=PackageList, File=self.MetaFile, Line=Record[-1])\r
@@ -723,7 +723,7 @@ class InfBuildData(ModuleBuildClassObject):
                 CName = Record[0]\r
                 Value = PpiValue(CName, self.Packages, self.MetaFile.Path)\r
                 if Value is None:\r
-                    PackageList = "\n\t".join([str(P) for P in self.Packages])\r
+                    PackageList = "\n\t".join(str(P) for P in self.Packages)\r
                     EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
                                     "Value of PPI [%s] is not found under [Ppis] section in " % CName,\r
                                     ExtraData=PackageList, File=self.MetaFile, Line=Record[-1])\r
@@ -748,7 +748,7 @@ class InfBuildData(ModuleBuildClassObject):
                 CName = Record[0]\r
                 Value = GuidValue(CName, self.Packages, self.MetaFile.Path)\r
                 if Value is None:\r
-                    PackageList = "\n\t".join([str(P) for P in self.Packages])\r
+                    PackageList = "\n\t".join(str(P) for P in self.Packages)\r
                     EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
                                     "Value of Guid [%s] is not found under [Guids] section in" % CName,\r
                                     ExtraData=PackageList, File=self.MetaFile, Line=Record[-1])\r
@@ -918,7 +918,7 @@ class InfBuildData(ModuleBuildClassObject):
                             if Value is None:\r
                                 Value = GuidValue(Token, self.Packages, self.MetaFile.Path)\r
                         if Value is None:\r
-                            PackageList = "\n\t".join([str(P) for P in self.Packages])\r
+                            PackageList = "\n\t".join(str(P) for P in self.Packages)\r
                             EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
                                             "Value of [%s] is not found in" % Token,\r
                                             ExtraData=PackageList, File=self.MetaFile, Line=Record[-1])\r
@@ -961,7 +961,7 @@ class InfBuildData(ModuleBuildClassObject):
             if TokenSpaceGuid not in self.Guids:\r
                 Value = GuidValue(TokenSpaceGuid, self.Packages, self.MetaFile.Path)\r
                 if Value is None:\r
-                    PackageList = "\n\t".join([str(P) for P in self.Packages])\r
+                    PackageList = "\n\t".join(str(P) for P in self.Packages)\r
                     EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
                                     "Value of Guid [%s] is not found under [Guids] section in" % TokenSpaceGuid,\r
                                     ExtraData=PackageList, File=self.MetaFile, Line=LineNo)\r
@@ -1121,7 +1121,7 @@ class InfBuildData(ModuleBuildClassObject):
                     else:\r
                         try:\r
                             Pcd.DefaultValue = ValueExpressionEx(Pcd.DefaultValue, Pcd.DatumType, _GuidDict)(True)\r
-                        except BadExpression, Value:\r
+                        except BadExpression as Value:\r
                             EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s", %s' %(TokenSpaceGuid, PcdRealName, Pcd.DefaultValue, Value),\r
                                             File=self.MetaFile, Line=LineNo)\r
                     break\r
@@ -1131,7 +1131,7 @@ class InfBuildData(ModuleBuildClassObject):
                             FORMAT_INVALID,\r
                             "PCD [%s.%s] in [%s] is not found in dependent packages:" % (TokenSpaceGuid, PcdRealName, self.MetaFile),\r
                             File=self.MetaFile, Line=LineNo,\r
-                            ExtraData="\t%s" % '\n\t'.join([str(P) for P in self.Packages])\r
+                            ExtraData="\t%s" % '\n\t'.join(str(P) for P in self.Packages)\r
                             )\r
             Pcds[PcdCName, TokenSpaceGuid] = Pcd\r
 \r