BaseTools: Use absolute import in Workspace

[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 cf5e1df3a523b7b70b57a4d6c28a83e913d534b7..f79ffe28d804b148e4bc554e6f9c73f648283143 100644 (file)
--- a/BaseTools/Source/Python/Workspace/InfBuildData.py
+++ b/BaseTools/Source/Python/Workspace/InfBuildData.py
@@ -12,11 +12,12 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r
-from Common.String import *\r
+from __future__ import absolute_import\r
+from Common.StringUtils import *\r
 from Common.DataType import *\r
 from Common.Misc import *\r
 from types import *\r
-from MetaFileParser import *\r
+from .MetaFileParser import *\r
 from collections import OrderedDict\r
 \r
 from Workspace.BuildClassObject import ModuleBuildClassObject, LibraryClassObject, PcdClassObject\r
@@ -698,7 +699,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 +724,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 +749,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 +919,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 +962,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
@@ -1116,12 +1117,12 @@ class InfBuildData(ModuleBuildClassObject):
                     Pcd.DatumType = PcdInPackage.DatumType\r
                     Pcd.MaxDatumSize = PcdInPackage.MaxDatumSize\r
                     Pcd.InfDefaultValue = Pcd.DefaultValue\r
-                    if Pcd.DefaultValue in [None, '']:\r
+                    if not Pcd.DefaultValue:\r
                         Pcd.DefaultValue = PcdInPackage.DefaultValue\r
                     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 +1132,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