BaseTools: Remove equality operator with None

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Object / Parser / InfDefineObject.py

diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py
index 1d074ee638fdfb8da5928c08db65c7959715bf95..bbc797f65e3783ef0977c4172a3d0ddb263aca6f 100644 (file)
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py
@@ -62,7 +62,7 @@ class InfDefSectionOptionRomInfo():
         #\r
         # Value has been set before.\r
         #\r
-        if self.PciVendorId != None:\r
+        if self.PciVendorId is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND%(DT.TAB_INF_DEFINES_PCI_VENDOR_ID),\r
                        LineInfo=self.CurrentLine)\r
             return False           \r
@@ -86,7 +86,7 @@ class InfDefSectionOptionRomInfo():
         #\r
         # Value has been set before.\r
         #\r
-        if self.PciDeviceId != None:\r
+        if self.PciDeviceId is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND%(DT.TAB_INF_DEFINES_PCI_DEVICE_ID),\r
                        LineInfo=self.CurrentLine)\r
             return False         \r
@@ -110,7 +110,7 @@ class InfDefSectionOptionRomInfo():
         #\r
         # Value has been set before.\r
         #\r
-        if self.PciClassCode != None:\r
+        if self.PciClassCode is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND%(DT.TAB_INF_DEFINES_PCI_CLASS_CODE),\r
                        LineInfo=self.CurrentLine)\r
             return False        \r
@@ -135,7 +135,7 @@ class InfDefSectionOptionRomInfo():
         #\r
         # Value has been set before.\r
         #\r
-        if self.PciRevision != None:\r
+        if self.PciRevision is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND%(DT.TAB_INF_DEFINES_PCI_REVISION),\r
                        LineInfo=self.CurrentLine)\r
             return False          \r
@@ -159,7 +159,7 @@ class InfDefSectionOptionRomInfo():
         #\r
         # Value has been set before.\r
         #\r
-        if self.PciCompress != None:\r
+        if self.PciCompress is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND%(DT.TAB_INF_DEFINES_PCI_COMPRESS),\r
                        LineInfo=self.CurrentLine)\r
             return False\r
@@ -215,11 +215,11 @@ class InfDefSection(InfDefSectionOptionRomInfo):
         #\r
         # Value has been set before.\r
         #\r
-        if self.BaseName != None:    \r
+        if self.BaseName is not None:    \r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND%(DT.TAB_INF_DEFINES_BASE_NAME),\r
                        LineInfo=self.CurrentLine)\r
             return False     \r
-        if not (BaseName == '' or BaseName == None):\r
+        if not (BaseName == '' or BaseName is None):\r
             if IsValidWord(BaseName) and not BaseName.startswith("_"):\r
                 self.BaseName = InfDefMember()\r
                 self.BaseName.SetValue(BaseName)\r
@@ -243,7 +243,7 @@ class InfDefSection(InfDefSectionOptionRomInfo):
         #\r
         # Value has been set before.\r
         #\r
-        if self.FileGuid != None:    \r
+        if self.FileGuid is not None:    \r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\\r
                        %(DT.TAB_INF_DEFINES_FILE_GUID),\r
                        LineInfo=self.CurrentLine)\r
@@ -274,7 +274,7 @@ class InfDefSection(InfDefSectionOptionRomInfo):
         #\r
         # Value has been set before.\r
         #\r
-        if self.ModuleType != None:    \r
+        if self.ModuleType is not None:    \r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\\r
                        %(DT.TAB_INF_DEFINES_MODULE_TYPE),\r
                        LineInfo=self.CurrentLine)\r
@@ -309,7 +309,7 @@ class InfDefSection(InfDefSectionOptionRomInfo):
     def SetModuleUniFileName(self, ModuleUniFileName, Comments):\r
         if Comments:\r
             pass\r
-        if self.ModuleUniFileName != None:\r
+        if self.ModuleUniFileName is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND%(DT.TAB_INF_DEFINES_MODULE_UNI_FILE),\r
                        LineInfo=self.CurrentLine)\r
         self.ModuleUniFileName = ModuleUniFileName\r
@@ -327,7 +327,7 @@ class InfDefSection(InfDefSectionOptionRomInfo):
         #\r
         # Value has been set before.\r
         #\r
-        if self.InfVersion != None:    \r
+        if self.InfVersion is not None:    \r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\\r
                        %(DT.TAB_INF_DEFINES_INF_VERSION),\r
                        LineInfo=self.CurrentLine)\r
@@ -368,7 +368,7 @@ class InfDefSection(InfDefSectionOptionRomInfo):
         #\r
         # Value has been set before.\r
         #\r
-        if self.EdkReleaseVersion != None:    \r
+        if self.EdkReleaseVersion is not None:    \r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\\r
                        %(DT.TAB_INF_DEFINES_EDK_RELEASE_VERSION),\r
                        LineInfo=self.CurrentLine)\r
@@ -401,7 +401,7 @@ class InfDefSection(InfDefSectionOptionRomInfo):
         #\r
         # Value has been set before.\r
         #\r
-        if self.UefiSpecificationVersion != None:    \r
+        if self.UefiSpecificationVersion is not None:    \r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\\r
                        %(DT.TAB_INF_DEFINES_UEFI_SPECIFICATION_VERSION),\r
                        LineInfo=self.CurrentLine)\r
@@ -434,7 +434,7 @@ class InfDefSection(InfDefSectionOptionRomInfo):
         #\r
         # Value has been set before.\r
         #\r
-        if self.PiSpecificationVersion != None:    \r
+        if self.PiSpecificationVersion is not None:    \r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\\r
                        %(DT.TAB_INF_DEFINES_PI_SPECIFICATION_VERSION),\r
                        LineInfo=self.CurrentLine)\r
@@ -495,7 +495,7 @@ class InfDefSection(InfDefSectionOptionRomInfo):
         #\r
         # Value has been set before.\r
         #\r
-        if self.VersionString != None:    \r
+        if self.VersionString is not None:    \r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\\r
                        %(DT.TAB_INF_DEFINES_VERSION_STRING),\r
                        LineInfo=self.CurrentLine)\r
@@ -517,7 +517,7 @@ class InfDefSection(InfDefSectionOptionRomInfo):
         #\r
         # Value has been set before.\r
         #\r
-        if self.PcdIsDriver != None:    \r
+        if self.PcdIsDriver is not None:    \r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\\r
                        %(DT.TAB_INF_DEFINES_PCD_IS_DRIVER),\r
                        LineInfo=self.CurrentLine)\r
@@ -710,7 +710,7 @@ class InfDefSection(InfDefSectionOptionRomInfo):
         #\r
         # Value has been set before.\r
         #\r
-        if self.Shadow != None:\r
+        if self.Shadow is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND%(DT.TAB_INF_DEFINES_SHADOW),\r
                        LineInfo=self.CurrentLine)\r
             return False          \r
@@ -731,7 +731,7 @@ class InfDefSection(InfDefSectionOptionRomInfo):
     # <CustomMake>           ::=  [<Family> "|"] <Filename>\r
     #\r
     def SetCustomMakefile(self, CustomMakefile, Comments):\r
-        if not (CustomMakefile == '' or CustomMakefile == None):\r
+        if not (CustomMakefile == '' or CustomMakefile is None):\r
             ValueList = GetSplitValueList(CustomMakefile)\r
             if len(ValueList) == 1:\r
                 FileName = ValueList[0]\r
@@ -811,12 +811,12 @@ class InfDefSection(InfDefSectionOptionRomInfo):
         #\r
         # Value has been set before.\r
         #\r
-        if self.UefiHiiResourceSection != None:\r
+        if self.UefiHiiResourceSection is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\r
                        %(DT.TAB_INF_DEFINES_UEFI_HII_RESOURCE_SECTION),\r
                        LineInfo=self.CurrentLine)\r
             return False           \r
-        if not (UefiHiiResourceSection == '' or UefiHiiResourceSection == None):\r
+        if not (UefiHiiResourceSection == '' or UefiHiiResourceSection is None):\r
             if (IsValidBoolType(UefiHiiResourceSection)):\r
                 self.UefiHiiResourceSection = InfDefMember()\r
                 self.UefiHiiResourceSection.SetValue(UefiHiiResourceSection)\r
@@ -948,7 +948,7 @@ class InfDefObject(InfSectionCommonDef):
                            RaiseError=True)\r
             if Name == DT.TAB_INF_DEFINES_INF_VERSION:\r
                 HasFoundInfVersionFalg = True  \r
-            if not (Name == '' or Name == None):\r
+            if not (Name == '' or Name is None):\r
                 #\r
                 # Process "SPEC" Keyword definition.\r
                 #\r
@@ -971,7 +971,7 @@ class InfDefObject(InfSectionCommonDef):
                                    LineInfo=LineInfo)                           \r
                     else:\r
                         ProcessFunc = gFUNCTION_MAPPING_FOR_DEFINE_SECTION[Name]\r
-                    if (ProcessFunc != None):\r
+                    if (ProcessFunc is not None):\r
                         ProcessFunc(DefineList, Value, InfLineCommentObj)\r
                     self.Defines[ArchListString] = DefineList\r
                 else:\r
@@ -991,7 +991,7 @@ class InfDefObject(InfSectionCommonDef):
                     #                    \r
                     else:\r
                         ProcessFunc = gFUNCTION_MAPPING_FOR_DEFINE_SECTION[Name]\r
-                    if (ProcessFunc != None):\r
+                    if (ProcessFunc is not None):\r
                         ProcessFunc(DefineList, Value, InfLineCommentObj)\r
                     self.Defines[ArchListString] = DefineList\r
         #\r