BaseTools: Remove equality operator with None

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

diff --git a/BaseTools/Source/Python/GenFds/GuidSection.py b/BaseTools/Source/Python/GenFds/GuidSection.py
index ea737bb9a7ea5c251cc05d2f8197b50f622c783a..8362073f97a30c533ad4484cb53a8656a4df213b 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GuidSection.py
+++ b/BaseTools/Source/Python/GenFds/GuidSection.py
@@ -60,7 +60,7 @@ class GuidSection(GuidSectionClassObject) :
         #\r
         self.KeyStringList = KeyStringList\r
         self.CurrentArchList = GenFdsGlobalVariable.ArchList\r
-        if FfsInf != None:\r
+        if FfsInf is not None:\r
             self.Alignment = FfsInf.__ExtendMacro__(self.Alignment)\r
             self.NameGuid = FfsInf.__ExtendMacro__(self.NameGuid)\r
             self.SectionType = FfsInf.__ExtendMacro__(self.SectionType)\r
@@ -79,7 +79,7 @@ class GuidSection(GuidSectionClassObject) :
             if self.FvAddr != []:\r
                 #no use FvAddr when the image is processed.\r
                 self.FvAddr = []\r
-            if self.FvParentAddr != None:\r
+            if self.FvParentAddr is not None:\r
                 #no use Parent Addr when the image is processed.\r
                 self.FvParentAddr = None\r
 \r
@@ -99,20 +99,20 @@ class GuidSection(GuidSectionClassObject) :
                 if Sect.IncludeFvSection:\r
                     self.IncludeFvSection = Sect.IncludeFvSection\r
 \r
-            if align != None:\r
-                if MaxAlign == None:\r
+            if align is not None:\r
+                if MaxAlign is None:\r
                     MaxAlign = align\r
                 if GenFdsGlobalVariable.GetAlignment (align) > GenFdsGlobalVariable.GetAlignment (MaxAlign):\r
                     MaxAlign = align\r
             if ReturnSectList != []:\r
-                if align == None:\r
+                if align is None:\r
                     align = "1"\r
                 for file in ReturnSectList:\r
                     SectFile += (file,)\r
                     SectAlign.append(align)\r
 \r
-        if MaxAlign != None:\r
-            if self.Alignment == None:\r
+        if MaxAlign is not None:\r
+            if self.Alignment is None:\r
                 self.Alignment = MaxAlign\r
             else:\r
                 if GenFdsGlobalVariable.GetAlignment (MaxAlign) > GenFdsGlobalVariable.GetAlignment (self.Alignment):\r
@@ -128,21 +128,21 @@ class GuidSection(GuidSectionClassObject) :
 \r
         ExternalTool = None\r
         ExternalOption = None\r
-        if self.NameGuid != None:\r
+        if self.NameGuid is not None:\r
             ExternalTool, ExternalOption = FindExtendTool(self.KeyStringList, self.CurrentArchList, self.NameGuid)\r
 \r
         #\r
         # If not have GUID , call default\r
         # GENCRC32 section\r
         #\r
-        if self.NameGuid == None :\r
+        if self.NameGuid is None :\r
             GenFdsGlobalVariable.VerboseLogger("Use GenSection function Generate CRC32 Section")\r
             GenFdsGlobalVariable.GenerateSection(OutputFile, SectFile, Section.Section.SectionType[self.SectionType], InputAlign=SectAlign, IsMakefile=IsMakefile)\r
             OutputFileList = []\r
             OutputFileList.append(OutputFile)\r
             return OutputFileList, self.Alignment\r
         #or GUID not in External Tool List\r
-        elif ExternalTool == None:\r
+        elif ExternalTool is None:\r
             EdkLogger.error("GenFds", GENFDS_ERROR, "No tool found with GUID %s" % self.NameGuid)\r
         else:\r
             DummyFile = OutputFile + ".dummy"\r
@@ -170,10 +170,10 @@ class GuidSection(GuidSectionClassObject) :
 \r
             FirstCall = False\r
             CmdOption = '-e'\r
-            if ExternalOption != None:\r
+            if ExternalOption is not None:\r
                 CmdOption = CmdOption + ' ' + ExternalOption\r
             if not GenFdsGlobalVariable.EnableGenfdsMultiThread:\r
-                if self.ProcessRequired not in ("TRUE", "1") and self.IncludeFvSection and not FvAddrIsSet and self.FvParentAddr != None:\r
+                if self.ProcessRequired not in ("TRUE", "1") and self.IncludeFvSection and not FvAddrIsSet and self.FvParentAddr is not None:\r
                     #FirstCall is only set for the encapsulated flash FV image without process required attribute.\r
                     FirstCall = True\r
                 #\r
@@ -213,7 +213,7 @@ class GuidSection(GuidSectionClassObject) :
                 if self.ExtraHeaderSize != -1:\r
                     HeaderLength = str(self.ExtraHeaderSize)\r
 \r
-                if self.ProcessRequired == "NONE" and HeaderLength == None:\r
+                if self.ProcessRequired == "NONE" and HeaderLength is None:\r
                     if TempFileSize > InputFileSize:\r
                         FileHandleIn.seek(0)\r
                         BufferIn = FileHandleIn.read()\r
@@ -222,7 +222,7 @@ class GuidSection(GuidSectionClassObject) :
                         if BufferIn == BufferOut[TempFileSize - InputFileSize:]:\r
                             HeaderLength = str(TempFileSize - InputFileSize)\r
                     #auto sec guided attribute with process required\r
-                    if HeaderLength == None:\r
+                    if HeaderLength is None:\r
                         Attribute.append('PROCESSING_REQUIRED')\r
 \r
                 FileHandleIn.close()\r
@@ -253,7 +253,7 @@ class GuidSection(GuidSectionClassObject) :
                     HeaderLength = str(self.ExtraHeaderSize)\r
                 if self.AuthStatusValid in ("TRUE", "1"):\r
                     Attribute.append('AUTH_STATUS_VALID')\r
-                if self.ProcessRequired == "NONE" and HeaderLength == None:\r
+                if self.ProcessRequired == "NONE" and HeaderLength is None:\r
                     GenFdsGlobalVariable.GenerateSection(OutputFile, [TempFile], Section.Section.SectionType['GUIDED'],\r
                                                          Guid=self.NameGuid, GuidAttr=Attribute,\r
                                                          GuidHdrLen=HeaderLength, DummyFile=DummyFile, IsMakefile=IsMakefile)\r