BaseTools: Remove equality operator with None

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / DecBuildData.py

diff --git a/BaseTools/Source/Python/Workspace/DecBuildData.py b/BaseTools/Source/Python/Workspace/DecBuildData.py
index 4d6edadc8f9d008bb5a4ca45d92a70aa23c9de29..49ef1df4aa76bb8e11e06b70e18fb9a826899f5d 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DecBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DecBuildData.py
@@ -107,7 +107,7 @@ class DecBuildData(PackageBuildClassObject):
 \r
     ## Get current effective macros\r
     def _GetMacros(self):\r
 \r
     ## Get current effective macros\r
     def _GetMacros(self):\r

-        if self.__Macros == None:\r
+        if self.__Macros is None:\r

             self.__Macros = {}\r
             self.__Macros.update(GlobalData.gGlobalDefines)\r
         return self.__Macros\r
             self.__Macros = {}\r
             self.__Macros.update(GlobalData.gGlobalDefines)\r
         return self.__Macros\r


@@ -145,34 +145,34 @@ class DecBuildData(PackageBuildClassObject):
 \r
     ## Retrieve package name\r
     def _GetPackageName(self):\r
 \r
     ## Retrieve package name\r
     def _GetPackageName(self):\r

-        if self._PackageName == None:\r
-            if self._Header == None:\r
+        if self._PackageName is None:\r
+            if self._Header is None:\r

                 self._GetHeaderInfo()\r
                 self._GetHeaderInfo()\r

-            if self._PackageName == None:\r
+            if self._PackageName is None:\r

                 EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE, "No PACKAGE_NAME", File=self.MetaFile)\r
         return self._PackageName\r
 \r
     ## Retrieve file guid\r
     def _GetFileGuid(self):\r
                 EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE, "No PACKAGE_NAME", File=self.MetaFile)\r
         return self._PackageName\r
 \r
     ## Retrieve file guid\r
     def _GetFileGuid(self):\r

-        if self._Guid == None:\r
-            if self._Header == None:\r
+        if self._Guid is None:\r
+            if self._Header is None:\r

                 self._GetHeaderInfo()\r
                 self._GetHeaderInfo()\r

-            if self._Guid == None:\r
+            if self._Guid is None:\r

                 EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE, "No PACKAGE_GUID", File=self.MetaFile)\r
         return self._Guid\r
 \r
     ## Retrieve package version\r
     def _GetVersion(self):\r
                 EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE, "No PACKAGE_GUID", File=self.MetaFile)\r
         return self._Guid\r
 \r
     ## Retrieve package version\r
     def _GetVersion(self):\r

-        if self._Version == None:\r
-            if self._Header == None:\r
+        if self._Version is None:\r
+            if self._Header is None:\r

                 self._GetHeaderInfo()\r
                 self._GetHeaderInfo()\r

-            if self._Version == None:\r
+            if self._Version is None:\r

                 self._Version = ''\r
         return self._Version\r
 \r
     ## Retrieve protocol definitions (name/value pairs)\r
     def _GetProtocol(self):\r
                 self._Version = ''\r
         return self._Version\r
 \r
     ## Retrieve protocol definitions (name/value pairs)\r
     def _GetProtocol(self):\r

-        if self._Protocols == None:\r
+        if self._Protocols is None:\r

             #\r
             # tdict is a special kind of dict, used for selecting correct\r
             # protocol defition for given ARCH\r
             #\r
             # tdict is a special kind of dict, used for selecting correct\r
             # protocol defition for given ARCH\r


@@ -214,7 +214,7 @@ class DecBuildData(PackageBuildClassObject):
 \r
     ## Retrieve PPI definitions (name/value pairs)\r
     def _GetPpi(self):\r
 \r
     ## Retrieve PPI definitions (name/value pairs)\r
     def _GetPpi(self):\r

-        if self._Ppis == None:\r
+        if self._Ppis is None:\r

             #\r
             # tdict is a special kind of dict, used for selecting correct\r
             # PPI defition for given ARCH\r
             #\r
             # tdict is a special kind of dict, used for selecting correct\r
             # PPI defition for given ARCH\r


@@ -256,7 +256,7 @@ class DecBuildData(PackageBuildClassObject):
 \r
     ## Retrieve GUID definitions (name/value pairs)\r
     def _GetGuid(self):\r
 \r
     ## Retrieve GUID definitions (name/value pairs)\r
     def _GetGuid(self):\r

-        if self._Guids == None:\r
+        if self._Guids is None:\r

             #\r
             # tdict is a special kind of dict, used for selecting correct\r
             # GUID defition for given ARCH\r
             #\r
             # tdict is a special kind of dict, used for selecting correct\r
             # GUID defition for given ARCH\r


@@ -298,7 +298,7 @@ class DecBuildData(PackageBuildClassObject):
 \r
     ## Retrieve public include paths declared in this package\r
     def _GetInclude(self):\r
 \r
     ## Retrieve public include paths declared in this package\r
     def _GetInclude(self):\r

-        if self._Includes == None or self._CommonIncludes is None:\r
+        if self._Includes is None or self._CommonIncludes is None:\r

             self._CommonIncludes = []\r
             self._Includes = []\r
             self._PrivateIncludes = []\r
             self._CommonIncludes = []\r
             self._Includes = []\r
             self._PrivateIncludes = []\r


@@ -333,7 +333,7 @@ class DecBuildData(PackageBuildClassObject):
 \r
     ## Retrieve library class declarations (not used in build at present)\r
     def _GetLibraryClass(self):\r
 \r
     ## Retrieve library class declarations (not used in build at present)\r
     def _GetLibraryClass(self):\r

-        if self._LibraryClasses == None:\r
+        if self._LibraryClasses is None:\r

             #\r
             # tdict is a special kind of dict, used for selecting correct\r
             # library class declaration for given ARCH\r
             #\r
             # tdict is a special kind of dict, used for selecting correct\r
             # library class declaration for given ARCH\r


@@ -357,7 +357,7 @@ class DecBuildData(PackageBuildClassObject):
 \r
     ## Retrieve PCD declarations\r
     def _GetPcds(self):\r
 \r
     ## Retrieve PCD declarations\r
     def _GetPcds(self):\r

-        if self._Pcds == None:\r
+        if self._Pcds is None:\r

             self._Pcds = sdict()\r
             self._Pcds.update(self._GetPcd(MODEL_PCD_FIXED_AT_BUILD))\r
             self._Pcds.update(self._GetPcd(MODEL_PCD_PATCHABLE_IN_MODULE))\r
             self._Pcds = sdict()\r
             self._Pcds.update(self._GetPcd(MODEL_PCD_FIXED_AT_BUILD))\r
             self._Pcds.update(self._GetPcd(MODEL_PCD_PATCHABLE_IN_MODULE))\r


@@ -422,7 +422,7 @@ class DecBuildData(PackageBuildClassObject):
             # will automatically turn to 'common' ARCH and try again\r
             #\r
             Setting,LineNo = PcdDict[self._Arch, PcdCName, TokenSpaceGuid]\r
             # will automatically turn to 'common' ARCH and try again\r
             #\r
             Setting,LineNo = PcdDict[self._Arch, PcdCName, TokenSpaceGuid]\r

-            if Setting == None:\r
+            if Setting is None:\r

                 continue\r
 \r
             DefaultValue, DatumType, TokenNumber = AnalyzePcdData(Setting)\r
                 continue\r
 \r
             DefaultValue, DatumType, TokenNumber = AnalyzePcdData(Setting)\r


@@ -454,7 +454,7 @@ class DecBuildData(PackageBuildClassObject):
         StructPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*$')\r
         for pcd in Pcds.values():\r
             if pcd.DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64, TAB_VOID, "BOOLEAN"]:\r
         StructPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*$')\r
         for pcd in Pcds.values():\r
             if pcd.DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64, TAB_VOID, "BOOLEAN"]:\r

-                if StructPattern.match(pcd.DatumType) == None:\r
+                if StructPattern.match(pcd.DatumType) is None:\r

                     EdkLogger.error('build', FORMAT_INVALID, "DatumType only support BOOLEAN, UINT8, UINT16, UINT32, UINT64, VOID* or a valid struct name.", pcd.DefinitionPosition[0],pcd.DefinitionPosition[1])\r
         for struct_pcd in Pcds.values():\r
             if isinstance(struct_pcd,StructurePcd) and not struct_pcd.StructuredPcdIncludeFile:\r
                     EdkLogger.error('build', FORMAT_INVALID, "DatumType only support BOOLEAN, UINT8, UINT16, UINT32, UINT64, VOID* or a valid struct name.", pcd.DefinitionPosition[0],pcd.DefinitionPosition[1])\r
         for struct_pcd in Pcds.values():\r
             if isinstance(struct_pcd,StructurePcd) and not struct_pcd.StructuredPcdIncludeFile:\r