BaseTools: Remove equality operator with None

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / BuildEngine.py

diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/Source/Python/AutoGen/BuildEngine.py
index ee1d3c89f292d3cbbcdc96bbd57845c130b3bb0f..0daed7da610db1340c273205b671cb55a1166b95 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/BuildEngine.py
+++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py
@@ -346,12 +346,12 @@ class BuildRule:
     def __init__(self, File=None, Content=None, LineIndex=0, SupportedFamily=["MSFT", "INTEL", "GCC", "RVCT"]):\r
         self.RuleFile = File\r
         # Read build rules from file if it's not none\r
-        if File != None:\r
+        if File is not None:\r
             try:\r
                 self.RuleContent = open(File, 'r').readlines()\r
             except:\r
                 EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=File)\r
-        elif Content != None:\r
+        elif Content is not None:\r
             self.RuleContent = Content\r
         else:\r
             EdkLogger.error("build", PARAMETER_MISSING, ExtraData="No rule file or string given")\r
@@ -388,7 +388,7 @@ class BuildRule:
             \r
             # find the build_rule_version\r
             if Line and Line[0] == "#" and Line.find(TAB_BUILD_RULE_VERSION) <> -1:\r
-                if Line.find("=") <> -1 and Line.find("=") < (len(Line)-1) and (Line[(Line.find("=") + 1):]).split():\r
+                if Line.find("=") <> -1 and Line.find("=") < (len(Line) - 1) and (Line[(Line.find("=") + 1):]).split():\r
                     self._FileVersion = (Line[(Line.find("=") + 1):]).split()[0]\r
             # skip empty or comment line\r
             if Line == "" or Line[0] == "#":\r
@@ -470,16 +470,16 @@ class BuildRule:
             if TokenList[0] == "BUILD":\r
                 if len(TokenList) == 1:\r
                     EdkLogger.error("build", FORMAT_INVALID, "Invalid rule section",\r
-                                    File=self.RuleFile, Line=LineIndex+1,\r
+                                    File=self.RuleFile, Line=LineIndex + 1,\r
                                     ExtraData=self.RuleContent[LineIndex])\r
 \r
                 FileType = TokenList[1]\r
                 if FileType == '':\r
                     EdkLogger.error("build", FORMAT_INVALID, "No file type given",\r
-                                    File=self.RuleFile, Line=LineIndex+1,\r
+                                    File=self.RuleFile, Line=LineIndex + 1,\r
                                     ExtraData=self.RuleContent[LineIndex])\r
-                if self._FileTypePattern.match(FileType) == None:\r
-                    EdkLogger.error("build", FORMAT_INVALID, File=self.RuleFile, Line=LineIndex+1,\r
+                if self._FileTypePattern.match(FileType) is None:\r
+                    EdkLogger.error("build", FORMAT_INVALID, File=self.RuleFile, Line=LineIndex + 1,\r
                                     ExtraData="Only character, number (non-first character), '_' and '-' are allowed in file type")\r
             # new format: File-Type.Build-Type.Arch\r
             else:\r
@@ -488,7 +488,7 @@ class BuildRule:
                 elif FileType != TokenList[0]:\r
                     EdkLogger.error("build", FORMAT_INVALID,\r
                                     "Different file types are not allowed in the same rule section",\r
-                                    File=self.RuleFile, Line=LineIndex+1,\r
+                                    File=self.RuleFile, Line=LineIndex + 1,\r
                                     ExtraData=self.RuleContent[LineIndex])\r
                 if len(TokenList) > 1:\r
                     BuildType = TokenList[1]\r
@@ -502,12 +502,12 @@ class BuildRule:
         if 'COMMON' in self._BuildTypeList and len(self._BuildTypeList) > 1:\r
             EdkLogger.error("build", FORMAT_INVALID,\r
                             "Specific build types must not be mixed with common one",\r
-                            File=self.RuleFile, Line=LineIndex+1,\r
+                            File=self.RuleFile, Line=LineIndex + 1,\r
                             ExtraData=self.RuleContent[LineIndex])\r
         if 'COMMON' in self._ArchList and len(self._ArchList) > 1:\r
             EdkLogger.error("build", FORMAT_INVALID,\r
                             "Specific ARCH must not be mixed with common one",\r
-                            File=self.RuleFile, Line=LineIndex+1,\r
+                            File=self.RuleFile, Line=LineIndex + 1,\r
                             ExtraData=self.RuleContent[LineIndex])\r
 \r
         self._FileType = FileType\r
@@ -531,7 +531,7 @@ class BuildRule:
             elif SectionType != Type:\r
                 EdkLogger.error("build", FORMAT_INVALID,\r
                                 "Two different section types are not allowed in the same sub-section",\r
-                                File=self.RuleFile, Line=LineIndex+1,\r
+                                File=self.RuleFile, Line=LineIndex + 1,\r
                                 ExtraData=self.RuleContent[LineIndex])\r
 \r
             if len(TokenList) > 1:\r
@@ -548,10 +548,10 @@ class BuildRule:
         if 'COMMON' in FamilyList and len(FamilyList) > 1:\r
             EdkLogger.error("build", FORMAT_INVALID,\r
                             "Specific tool chain family should not be mixed with general one",\r
-                            File=self.RuleFile, Line=LineIndex+1,\r
+                            File=self.RuleFile, Line=LineIndex + 1,\r
                             ExtraData=self.RuleContent[LineIndex])\r
         if self._State not in self._StateHandler:\r
-            EdkLogger.error("build", FORMAT_INVALID, File=self.RuleFile, Line=LineIndex+1,\r
+            EdkLogger.error("build", FORMAT_INVALID, File=self.RuleFile, Line=LineIndex + 1,\r
                             ExtraData="Unknown subsection: %s" % self.RuleContent[LineIndex])\r
     ## Parse <InputFile> sub-section\r
     #\r
@@ -561,7 +561,7 @@ class BuildRule:
         FileList = [File.strip() for File in self.RuleContent[LineIndex].split(",")]\r
         for ToolChainFamily in self._FamilyList:\r
             InputFiles = self._RuleInfo[ToolChainFamily, self._State]\r
-            if InputFiles == None:\r
+            if InputFiles is None:\r
                 InputFiles = []\r
                 self._RuleInfo[ToolChainFamily, self._State] = InputFiles\r
             InputFiles.extend(FileList)\r
@@ -573,7 +573,7 @@ class BuildRule:
     def ParseCommon(self, LineIndex):\r
         for ToolChainFamily in self._FamilyList:\r
             Items = self._RuleInfo[ToolChainFamily, self._State]\r
-            if Items == None:\r
+            if Items is None:\r
                 Items = []\r
                 self._RuleInfo[ToolChainFamily, self._State] = Items\r
             Items.append(self.RuleContent[LineIndex])\r