BaseTools: AutoGen - GenVar refactor static methods

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

diff --git a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py b/BaseTools/Source/Python/GenFds/OptRomInfStatement.py
index 80c4bbab6effa848b416e2535c742e10f7f29c44..a865ac4436d5c39d031e3ea3e90b6da11cafd459 100644 (file)
--- a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/OptRomInfStatement.py
@@ -46,10 +46,10 @@ class OptRomInfStatement (FfsInfStatement):
     #\r
     def __GetOptRomParams(self):\r
         \r
-        if self.OverrideAttribs == None:\r
+        if self.OverrideAttribs is None:\r
             self.OverrideAttribs = OptionRom.OverrideAttribs()\r
 \r
-        if self.OverrideAttribs.NeedCompress == None:\r
+        if self.OverrideAttribs.NeedCompress is None:\r
             self.OverrideAttribs.NeedCompress = self.OptRomDefs.get ('PCI_COMPRESS')\r
             if self.OverrideAttribs.NeedCompress is not None:\r
                 if self.OverrideAttribs.NeedCompress.upper() not in ('TRUE', 'FALSE'):\r
@@ -57,16 +57,16 @@ class OptRomInfStatement (FfsInfStatement):
                 self.OverrideAttribs.NeedCompress = \\r
                     self.OverrideAttribs.NeedCompress.upper() == 'TRUE'\r
 \r
-        if self.OverrideAttribs.PciVendorId == None:\r
+        if self.OverrideAttribs.PciVendorId is None:\r
             self.OverrideAttribs.PciVendorId = self.OptRomDefs.get ('PCI_VENDOR_ID')\r
         \r
-        if self.OverrideAttribs.PciClassCode == None:\r
+        if self.OverrideAttribs.PciClassCode is None:\r
             self.OverrideAttribs.PciClassCode = self.OptRomDefs.get ('PCI_CLASS_CODE')\r
             \r
-        if self.OverrideAttribs.PciDeviceId == None:\r
+        if self.OverrideAttribs.PciDeviceId is None:\r
             self.OverrideAttribs.PciDeviceId = self.OptRomDefs.get ('PCI_DEVICE_ID')\r
             \r
-        if self.OverrideAttribs.PciRevision == None:\r
+        if self.OverrideAttribs.PciRevision is None:\r
             self.OverrideAttribs.PciRevision = self.OptRomDefs.get ('PCI_REVISION')\r
         \r
 #        InfObj = GenFdsGlobalVariable.WorkSpace.BuildObject[self.PathClassObj, self.CurrentArch]  \r
@@ -93,7 +93,6 @@ class OptRomInfStatement (FfsInfStatement):
         #\r
         Rule = self.__GetRule__()\r
         GenFdsGlobalVariable.VerboseLogger( "Packing binaries from inf file : %s" %self.InfFileName)\r
-        #FileType = Ffs.Ffs.ModuleTypeToFileType[Rule.ModuleType]\r
         #\r
         # For the rule only has simpleFile\r
         #\r
@@ -121,7 +120,7 @@ class OptRomInfStatement (FfsInfStatement):
         #\r
 \r
         OutputFileList = []\r
-        if Rule.FileName != None:\r
+        if Rule.FileName is not None:\r
             GenSecInputFile = self.__ExtendMacro__(Rule.FileName)\r
             OutputFileList.append(GenSecInputFile)\r
         else:\r
@@ -142,8 +141,8 @@ class OptRomInfStatement (FfsInfStatement):
 \r
         OutputFileList = []\r
         for Sect in Rule.SectionList:\r
-            if Sect.SectionType == 'PE32':\r
-                if Sect.FileName != None:\r
+            if Sect.SectionType == BINARY_FILE_TYPE_PE32:\r
+                if Sect.FileName is not None:\r
                     GenSecInputFile = self.__ExtendMacro__(Sect.FileName)\r
                     OutputFileList.append(GenSecInputFile)\r
                 else:\r