BaseTools: Remove equality operator with None

[mirror_edk2.git] / BaseTools / Source / Python / GenPatchPcdTable / GenPatchPcdTable.py

diff --git a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
index d30a9a2baa8bb7d71de1ae444e059b45e16c8ccd..dc2ceaf775d88c5a179930c4430ee74212aa5307 100644 (file)
--- a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
+++ b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
@@ -73,7 +73,7 @@ def _parseForXcode(lines, efifilepath):
         if status == 1 and len(line) != 0:\r
             if '_gPcd_BinaryPatch_' in line:\r
                 m = re.match('^([\da-fA-FxX]+)([\s\S]*)([_]*_gPcd_BinaryPatch_([\w]+))', line)\r
-                if m != None:\r
+                if m is not None:\r
                     pcds.append((m.groups(0)[3], int(m.groups(0)[0], 16)))\r
     return pcds\r
 \r
@@ -99,20 +99,20 @@ def _parseForGCC(lines, efifilepath):
         # status handler\r
         if status == 3:\r
             m = re.match('^([\w_\.]+) +([\da-fA-Fx]+) +([\da-fA-Fx]+)$', line)\r
-            if m != None:\r
+            if m is not None:\r
                 sections.append(m.groups(0))\r
         if status == 3:\r
             m = re.match('^.data._gPcd_BinaryPatch_([\w_\d]+)$', line)\r
-            if m != None:\r
+            if m is not None:\r
                 if lines[index + 1]:\r
                     PcdName = m.groups(0)[0]\r
                     m = re.match('^([\da-fA-Fx]+) +([\da-fA-Fx]+)', lines[index + 1].strip())\r
-                    if m != None:\r
+                    if m is not None:\r
                         bpcds.append((PcdName, int(m.groups(0)[0], 16) , int(sections[-1][1], 16), sections[-1][0]))\r
                 \r
     # get section information from efi file\r
     efisecs = PeImageClass(efifilepath).SectionHeaderList\r
-    if efisecs == None or len(efisecs) == 0:\r
+    if efisecs is None or len(efisecs) == 0:\r
         return None\r
     #redirection\r
     redirection = 0\r
@@ -152,18 +152,18 @@ def _parseGeneral(lines, efifilepath):
             continue\r
         if status == 1 and len(line) != 0:\r
             m = secRe.match(line)\r
-            assert m != None, "Fail to parse the section in map file , line is %s" % line\r
+            assert m is not None, "Fail to parse the section in map file , line is %s" % line\r
             sec_no, sec_start, sec_length, sec_name, sec_class = m.groups(0)\r
             secs.append([int(sec_no, 16), int(sec_start, 16), int(sec_length, 16), sec_name, sec_class])\r
         if status == 2 and len(line) != 0:\r
             m = symRe.match(line)\r
-            assert m != None, "Fail to parse the symbol in map file, line is %s" % line\r
+            assert m is not None, "Fail to parse the symbol in map file, line is %s" % line\r
             sec_no, sym_offset, sym_name, vir_addr = m.groups(0)\r
             sec_no = int(sec_no, 16)\r
             sym_offset = int(sym_offset, 16)\r
             vir_addr = int(vir_addr, 16)\r
             m2 = re.match('^[_]+gPcd_BinaryPatch_([\w]+)', sym_name)\r
-            if m2 != None:\r
+            if m2 is not None:\r
                 # fond a binary pcd entry in map file\r
                 for sec in secs:\r
                     if sec[0] == sec_no and (sym_offset >= sec[1] and sym_offset < sec[1] + sec[2]):\r
@@ -173,7 +173,7 @@ def _parseGeneral(lines, efifilepath):
 \r
     # get section information from efi file\r
     efisecs = PeImageClass(efifilepath).SectionHeaderList\r
-    if efisecs == None or len(efisecs) == 0:\r
+    if efisecs is None or len(efisecs) == 0:\r
         return None\r
     \r
     pcds = []\r
@@ -214,12 +214,12 @@ if __name__ == '__main__':
   \r
     (options, args) = parser.parse_args()\r
 \r
-    if options.mapfile == None or options.efifile == None:\r
+    if options.mapfile is None or options.efifile is None:\r
         print parser.get_usage()\r
     elif os.path.exists(options.mapfile) and os.path.exists(options.efifile):\r
         list = parsePcdInfoFromMapFile(options.mapfile, options.efifile)\r
-        if list != None:\r
-            if options.outfile != None:\r
+        if list is not None:\r
+            if options.outfile is not None:\r
                 generatePcdTable(list, options.outfile)\r
             else:\r
                 generatePcdTable(list, options.mapfile.replace('.map', '.BinaryPcdTable.txt'))\r