Revert BaseTools: PYTHON3 migration

[mirror_edk2.git] / BaseTools / Scripts / PackageDocumentTools / plugins / EdkPlugins / edk2 / model / inf.py

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/inf.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/inf.py
index 9d70fbcf97dbfffab08f0c10921cf5fb3587cdc5..793e95efedcc7167fea997037908a13906af2351 100644 (file)
--- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/inf.py
+++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/inf.py
@@ -23,7 +23,7 @@ class INFFile(ini.BaseINIFile):
 \r
     def GetProduceLibraryClass(self):\r
         obj = self.GetDefine("LIBRARY_CLASS")\r
-        if obj == None: return None\r
+        if obj is None: return None\r
 \r
         return obj.split('|')[0].strip()\r
 \r
@@ -59,9 +59,9 @@ class INFFile(ini.BaseINIFile):
         if not ini.BaseINIFile.Parse(self):\r
             return False\r
         classname = self.GetProduceLibraryClass()\r
-        if classname != None:\r
+        if classname is not None:\r
             libobjdict = INFFile._libobjs\r
-            if libobjdict.has_key(classname):\r
+            if classname in libobjdict:\r
                 if self not in libobjdict[classname]:\r
                     libobjdict[classname].append(self)\r
             else:\r
@@ -77,7 +77,7 @@ class INFFile(ini.BaseINIFile):
 \r
     def Clear(self):\r
         classname = self.GetProduceLibraryClass()\r
-        if classname != None:\r
+        if classname is not None:\r
             libobjdict = INFFile._libobjs\r
             libobjdict[classname].remove(self)\r
             if len(libobjdict[classname]) == 0:\r
@@ -114,7 +114,7 @@ class INFSection(ini.BaseINISection):
         return arr[1]\r
 \r
     def IsArchMatch(self, arch):\r
-        if arch == None or self.GetArch() == 'common':\r
+        if arch is None or self.GetArch() == 'common':\r
             return True\r
 \r
         if self.GetArch().lower() != arch.lower():\r
@@ -169,7 +169,7 @@ class INFLibraryClassObject(INFSectionObject):
     def Parse(self):\r
         self._classname = self.GetLineByOffset(self._start).split('#')[0].strip()\r
         objdict = INFLibraryClassObject._objs\r
-        if objdict.has_key(self._classname):\r
+        if self._classname in objdict:\r
             objdict[self._classname].append(self)\r
         else:\r
             objdict[self._classname] = [self]\r
@@ -241,7 +241,7 @@ class INFSourceObject(INFSectionObject):
 \r
         self.mFilename = os.path.basename(self.GetSourceFullPath())\r
         objdict = INFSourceObject._objs\r
-        if not objdict.has_key(self.mFilename):\r
+        if self.mFilename not in objdict:\r
             objdict[self.mFilename] = [self]\r
         else:\r
             objdict[self.mFilename].append(self)\r
@@ -258,9 +258,9 @@ class INFSourceObject(INFSectionObject):
             del objdict[self.mFilename]\r
 \r
     def IsMatchFamily(self, family):\r
-        if family == None:\r
+        if family is None:\r
             return True\r
-        if self.mFamily != None:\r
+        if self.mFamily is not None:\r
             if family.strip().lower() == self.mFamily.lower():\r
                 return True\r
             else:\r
@@ -303,7 +303,7 @@ class INFPcdObject(INFSectionObject):
             self.mDefaultValue = arr[1].strip()\r
 \r
         objdict = INFPcdObject._objs\r
-        if objdict.has_key(self.GetName()):\r
+        if self.GetName() in objdict:\r
             if self not in objdict[self.GetName()]:\r
                 objdict[self.GetName()].append(self)\r
         else:\r