BaseTools: Remove equality operator with None

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

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py
index 05fa2529be2d2e7a959a238da39638b8e6b07960..7c120d85c255995e9b2d8adc1ae9fd55036b9d40 100644 (file)
--- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py
+++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py
@@ -74,7 +74,7 @@ class SurfaceObject(object):
 \r
     def Load(self, relativePath):\r
         # if has been loaded, directly return\r
-        if self._fileObj != None: return True\r
+        if self._fileObj is not None: return True\r
 \r
         relativePath = os.path.normpath(relativePath)\r
         fullPath = os.path.join(self._workspace, relativePath)\r
@@ -160,7 +160,7 @@ class Platform(SurfaceObject):
         return dsc.DSCFile\r
 \r
     def GetModuleCount(self):\r
-        if self.GetFileObj() == None:\r
+        if self.GetFileObj() is None:\r
             ErrorMsg("Fail to get module count because DSC file has not been load!")\r
 \r
         return len(self.GetFileObj().GetComponents())\r
@@ -171,7 +171,7 @@ class Platform(SurfaceObject):
     def LoadModules(self, precallback=None, postcallback=None):\r
         for obj in self.GetFileObj().GetComponents():\r
             mFilename = obj.GetFilename()\r
-            if precallback != None:\r
+            if precallback is not None:\r
                 precallback(self, mFilename)\r
             arch = obj.GetArch()\r
             if arch.lower() == 'common':\r
@@ -182,7 +182,7 @@ class Platform(SurfaceObject):
                 module = Module(self, self.GetWorkspace())\r
                 if module.Load(mFilename, arch, obj.GetOveridePcds(), obj.GetOverideLibs()):\r
                     self._modules.append(module)\r
-                    if postcallback != None:\r
+                    if postcallback is not None:\r
                         postcallback(self, module)\r
                 else:\r
                     del module\r
@@ -222,7 +222,7 @@ class Platform(SurfaceObject):
         for obj in objs:\r
             if obj.GetPcdName().lower() == name.lower():\r
                 arr.append(obj)\r
-        if arch != None:\r
+        if arch is not None:\r
             arr = self.FilterObjsByArch(arr, arch)\r
         return arr\r
 \r
@@ -292,7 +292,7 @@ class Platform(SurfaceObject):
             newSect = newDsc.AddNewSection(oldSect.GetName())\r
             for oldComObj in oldSect.GetObjects():\r
                 module = self.GetModuleObject(oldComObj.GetFilename(), oldSect.GetArch())\r
-                if module == None: continue\r
+                if module is None: continue\r
 \r
                 newComObj = dsc.DSCComponentObject(newSect)\r
                 newComObj.SetFilename(oldComObj.GetFilename())\r
@@ -300,7 +300,7 @@ class Platform(SurfaceObject):
                 # add all library instance for override section\r
                 libdict = module.GetLibraries()\r
                 for libclass in libdict.keys():\r
-                    if libdict[libclass] != None:\r
+                    if libdict[libclass] is not None:\r
                         newComObj.AddOverideLib(libclass, libdict[libclass].GetRelativeFilename().replace('\\', '/'))\r
 \r
                 # add all pcds for override section\r
@@ -338,7 +338,7 @@ class Module(SurfaceObject):
 \r
     def Destroy(self):\r
         for lib in self._libs.values():\r
-            if lib != None:\r
+            if lib is not None:\r
                 lib.Destroy()\r
         self._libs.clear()\r
 \r
@@ -351,12 +351,12 @@ class Module(SurfaceObject):
         del self._ppis[:]\r
 \r
         for protocol in self._protocols:\r
-            if protocol != None:\r
+            if protocol is not None:\r
                 protocol.DeRef(self)\r
         del self._protocols[:]\r
 \r
         for guid in self._guids:\r
-            if guid != None:\r
+            if guid is not None:\r
                 guid.DeRef(self)\r
         del self._guids[:]\r
 \r
@@ -375,9 +375,9 @@ class Module(SurfaceObject):
             return False\r
 \r
         self._arch = arch\r
-        if overidePcds != None:\r
+        if overidePcds is not None:\r
             self._overideLibs = overideLibs\r
-        if overideLibs != None:\r
+        if overideLibs is not None:\r
             self._overidePcds = overidePcds\r
 \r
         self._SearchLibraries()\r
@@ -403,7 +403,7 @@ class Module(SurfaceObject):
     def GetPcds(self):\r
         pcds = self._pcds.copy()\r
         for lib in self._libs.values():\r
-            if lib == None: continue\r
+            if lib is None: continue\r
             for name in lib._pcds.keys():\r
                 pcds[name] = lib._pcds[name]\r
         return pcds\r
@@ -412,7 +412,7 @@ class Module(SurfaceObject):
         ppis = []\r
         ppis += self._ppis\r
         for lib in self._libs.values():\r
-            if lib == None: continue\r
+            if lib is None: continue\r
             ppis += lib._ppis\r
         return ppis\r
 \r
@@ -420,7 +420,7 @@ class Module(SurfaceObject):
         pros = []\r
         pros = self._protocols\r
         for lib in self._libs.values():\r
-            if lib == None: continue\r
+            if lib is None: continue\r
             pros += lib._protocols\r
         return pros\r
 \r
@@ -428,7 +428,7 @@ class Module(SurfaceObject):
         guids = []\r
         guids += self._guids\r
         for lib in self._libs.values():\r
-            if lib == None: continue\r
+            if lib is None: continue\r
             guids += lib._guids\r
         return guids\r
 \r
@@ -436,12 +436,12 @@ class Module(SurfaceObject):
         deps = []\r
         deps += self._depexs\r
         for lib in self._libs.values():\r
-            if lib == None: continue\r
+            if lib is None: continue\r
             deps += lib._depexs\r
         return deps\r
 \r
     def IsLibrary(self):\r
-        return self.GetFileObj().GetDefine("LIBRARY_CLASS") != None\r
+        return self.GetFileObj().GetDefine("LIBRARY_CLASS") is not None\r
 \r
     def GetLibraryInstance(self, classname, arch, type):\r
         if classname not in self._libs.keys():\r
@@ -454,7 +454,7 @@ class Module(SurfaceObject):
             parent = self.GetParent()\r
             if issubclass(parent.__class__, Platform):\r
                 path = parent.GetLibraryPath(classname, arch, type)\r
-                if path == None:\r
+                if path is None:\r
                     ErrorMsg('Fail to get library instance for %s' % classname, self.GetFilename())\r
                     return None\r
                 self._libs[classname] = Library(self, self.GetWorkspace())\r
@@ -477,7 +477,7 @@ class Module(SurfaceObject):
                 continue\r
             classname = obj.GetClass()\r
             instance = self.GetLibraryInstance(classname, arch, type)\r
-            if not self.IsLibrary() and instance != None:\r
+            if not self.IsLibrary() and instance is not None:\r
                 instance._isInherit = False\r
 \r
             if classname not in self._libs.keys():\r
@@ -490,7 +490,7 @@ class Module(SurfaceObject):
         pros  = []\r
         deps  = []\r
         guids = []\r
-        if self.GetFileObj() != None:\r
+        if self.GetFileObj() is not None:\r
             pcds = self.FilterObjsByArch(self.GetFileObj().GetSectionObjectsByName('pcd'),\r
                                           self.GetArch())\r
             for pcd in pcds:\r
@@ -534,31 +534,31 @@ class Module(SurfaceObject):
         objs = self.GetFileObj().GetSectionObjectsByName('packages')\r
         for obj in objs:\r
             package = self.GetPlatform().GetPackage(obj.GetPath())\r
-            if package != None:\r
+            if package is not None:\r
                 self._packages.append(package)\r
 \r
     def GetPackages(self):\r
         return self._packages\r
 \r
     def GetPcdObjects(self):\r
-        if self.GetFileObj() == None:\r
+        if self.GetFileObj() is None:\r
             return []\r
 \r
         return self.GetFileObj().GetSectionObjectsByName('pcd')\r
 \r
     def GetLibraryClassHeaderFilePath(self):\r
         lcname = self.GetFileObj().GetProduceLibraryClass()\r
-        if lcname == None: return None\r
+        if lcname is None: return None\r
 \r
         pkgs = self.GetPackages()\r
         for package in pkgs:\r
             path = package.GetLibraryClassHeaderPathByName(lcname)\r
-            if path != None:\r
+            if path is not None:\r
                 return os.path.realpath(os.path.join(package.GetFileObj().GetPackageRootPath(), path))\r
         return None\r
 \r
     def Reload(self, force=False, callback=None):\r
-        if callback != None:\r
+        if callback is not None:\r
             callback(self, "Starting reload...")\r
 \r
         ret = SurfaceObject.Reload(self, force)\r
@@ -568,7 +568,7 @@ class Module(SurfaceObject):
             return True\r
 \r
         for lib in self._libs.values():\r
-            if lib != None:\r
+            if lib is not None:\r
                 lib.Destroy()\r
         self._libs.clear()\r
 \r
@@ -591,13 +591,13 @@ class Module(SurfaceObject):
         del self._packages[:]\r
         del self._depexs[:]\r
 \r
-        if callback != None:\r
+        if callback is not None:\r
             callback(self, "Searching libraries...")\r
         self._SearchLibraries()\r
-        if callback != None:\r
+        if callback is not None:\r
             callback(self, "Searching packages...")\r
         self._SearchPackage()\r
-        if callback != None:\r
+        if callback is not None:\r
             callback(self, "Searching surface items...")\r
         self._SearchSurfaceItems()\r
 \r
@@ -665,16 +665,16 @@ class Package(SurfaceObject):
 \r
     def Destroy(self):\r
         for pcd in self._pcds.values():\r
-            if pcd != None:\r
+            if pcd is not None:\r
                 pcd.Destroy()\r
         for guid in self._guids.values():\r
-            if guid != None:\r
+            if guid is not None:\r
                 guid.Destroy()\r
         for protocol in self._protocols.values():\r
-            if protocol != None:\r
+            if protocol is not None:\r
                 protocol.Destroy()\r
         for ppi in self._ppis.values():\r
-            if ppi != None:\r
+            if ppi is not None:\r
                 ppi.Destroy()\r
         self._pcds.clear()\r
         self._guids.clear()\r
@@ -689,7 +689,7 @@ class Package(SurfaceObject):
         pcds = self.GetFileObj().GetSectionObjectsByName('pcds')\r
         for pcd in pcds:\r
             if pcd.GetPcdName() in self._pcds.keys():\r
-                if self._pcds[pcd.GetPcdName()] != None:\r
+                if self._pcds[pcd.GetPcdName()] is not None:\r
                     self._pcds[pcd.GetPcdName()].AddDecObj(pcd)\r
             else:\r
                 self._pcds[pcd.GetPcdName()] = PcdItem(pcd.GetPcdName(), self, pcd)\r
@@ -726,7 +726,7 @@ class Package(SurfaceObject):
     def GetPcdDefineObjs(self, name=None):\r
         arr = []\r
         objs = self.GetFileObj().GetSectionObjectsByName('pcds')\r
-        if name == None: return objs\r
+        if name is None: return objs\r
 \r
         for obj in objs:\r
             if obj.GetPcdName().lower() == name.lower():\r
@@ -772,7 +772,7 @@ class ModulePcd(object):
 \r
     def __init__(self, parent, name, infObj, pcdItem):\r
         assert issubclass(parent.__class__, Module), "Module's PCD's parent must be module!"\r
-        assert pcdItem != None, 'Pcd %s does not in some package!' % name\r
+        assert pcdItem is not None, 'Pcd %s does not in some package!' % name\r
 \r
         self._name          = name\r
         self._parent        = parent\r