]> git.proxmox.com Git - mirror_edk2.git/blobdiff - BaseTools/Source/Python/Workspace/DscBuildData.py
BaseTools: Remove equality operator with None
[mirror_edk2.git] / BaseTools / Source / Python / Workspace / DscBuildData.py
index 1cc4dc966203e63e80d9afc6bcf399c65cfacf6f..cf9608651269edbe602618e6a84e1fe4f94526e1 100644 (file)
@@ -298,7 +298,7 @@ class DscBuildData(PlatformBuildClassObject):
 \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.gPlatformDefines)\r
             self.__Macros.update(GlobalData.gGlobalDefines)\r
@@ -368,7 +368,7 @@ class DscBuildData(PlatformBuildClassObject):
             elif Name == TAB_DSC_DEFINES_BUILD_TARGETS:\r
                 self._BuildTargets = GetSplitValueList(Record[2])\r
             elif Name == TAB_DSC_DEFINES_SKUID_IDENTIFIER:\r
-                if self._SkuName == None:\r
+                if self._SkuName is None:\r
                     self._SkuName = Record[2]\r
                 if GlobalData.gSKUID_CMD:\r
                     self._SkuName = GlobalData.gSKUID_CMD\r
@@ -427,76 +427,76 @@ class DscBuildData(PlatformBuildClassObject):
 \r
     ## Retrieve platform name\r
     def _GetPlatformName(self):\r
-        if self._PlatformName == None:\r
-            if self._Header == None:\r
+        if self._PlatformName is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
-            if self._PlatformName == None:\r
+            if self._PlatformName is None:\r
                 EdkLogger.error('build', ATTRIBUTE_NOT_AVAILABLE, "No PLATFORM_NAME", File=self.MetaFile)\r
         return self._PlatformName\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
-            if self._Guid == None:\r
+            if self._Guid is None:\r
                 EdkLogger.error('build', ATTRIBUTE_NOT_AVAILABLE, "No PLATFORM_GUID", File=self.MetaFile)\r
         return self._Guid\r
 \r
     ## Retrieve platform 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
-            if self._Version == None:\r
+            if self._Version is None:\r
                 EdkLogger.error('build', ATTRIBUTE_NOT_AVAILABLE, "No PLATFORM_VERSION", File=self.MetaFile)\r
         return self._Version\r
 \r
     ## Retrieve platform description file version\r
     def _GetDscSpec(self):\r
-        if self._DscSpecification == None:\r
-            if self._Header == None:\r
+        if self._DscSpecification is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
-            if self._DscSpecification == None:\r
+            if self._DscSpecification is None:\r
                 EdkLogger.error('build', ATTRIBUTE_NOT_AVAILABLE, "No DSC_SPECIFICATION", File=self.MetaFile)\r
         return self._DscSpecification\r
 \r
     ## Retrieve OUTPUT_DIRECTORY\r
     def _GetOutpuDir(self):\r
-        if self._OutputDirectory == None:\r
-            if self._Header == None:\r
+        if self._OutputDirectory is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
-            if self._OutputDirectory == None:\r
+            if self._OutputDirectory is None:\r
                 self._OutputDirectory = os.path.join("Build", self._PlatformName)\r
         return self._OutputDirectory\r
 \r
     ## Retrieve SUPPORTED_ARCHITECTURES\r
     def _GetSupArch(self):\r
-        if self._SupArchList == None:\r
-            if self._Header == None:\r
+        if self._SupArchList is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
-            if self._SupArchList == None:\r
+            if self._SupArchList is None:\r
                 EdkLogger.error('build', ATTRIBUTE_NOT_AVAILABLE, "No SUPPORTED_ARCHITECTURES", File=self.MetaFile)\r
         return self._SupArchList\r
 \r
     ## Retrieve BUILD_TARGETS\r
     def _GetBuildTarget(self):\r
-        if self._BuildTargets == None:\r
-            if self._Header == None:\r
+        if self._BuildTargets is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
-            if self._BuildTargets == None:\r
+            if self._BuildTargets is None:\r
                 EdkLogger.error('build', ATTRIBUTE_NOT_AVAILABLE, "No BUILD_TARGETS", File=self.MetaFile)\r
         return self._BuildTargets\r
 \r
     def _GetPcdInfoFlag(self):\r
-        if self._PcdInfoFlag == None or self._PcdInfoFlag.upper() == 'FALSE':\r
+        if self._PcdInfoFlag is None or self._PcdInfoFlag.upper() == 'FALSE':\r
             return False\r
         elif self._PcdInfoFlag.upper() == 'TRUE':\r
             return True\r
         else:\r
             return False\r
     def _GetVarCheckFlag(self):\r
-        if self._VarCheckFlag == None or self._VarCheckFlag.upper() == 'FALSE':\r
+        if self._VarCheckFlag is None or self._VarCheckFlag.upper() == 'FALSE':\r
             return False\r
         elif self._VarCheckFlag.upper() == 'TRUE':\r
             return True\r
@@ -505,10 +505,10 @@ class DscBuildData(PlatformBuildClassObject):
 \r
     # # Retrieve SKUID_IDENTIFIER\r
     def _GetSkuName(self):\r
-        if self._SkuName == None:\r
-            if self._Header == None:\r
+        if self._SkuName is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
-            if self._SkuName == None:\r
+            if self._SkuName is None:\r
                 self._SkuName = 'DEFAULT'\r
         return self._SkuName\r
 \r
@@ -517,72 +517,72 @@ class DscBuildData(PlatformBuildClassObject):
         self._SkuName = Value\r
 \r
     def _GetFdfFile(self):\r
-        if self._FlashDefinition == None:\r
-            if self._Header == None:\r
+        if self._FlashDefinition is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
-            if self._FlashDefinition == None:\r
+            if self._FlashDefinition is None:\r
                 self._FlashDefinition = ''\r
         return self._FlashDefinition\r
 \r
     def _GetPrebuild(self):\r
-        if self._Prebuild == None:\r
-            if self._Header == None:\r
+        if self._Prebuild is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
-            if self._Prebuild == None:\r
+            if self._Prebuild is None:\r
                 self._Prebuild = ''\r
         return self._Prebuild\r
 \r
     def _GetPostbuild(self):\r
-        if self._Postbuild == None:\r
-            if self._Header == None:\r
+        if self._Postbuild is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
-            if self._Postbuild == None:\r
+            if self._Postbuild is None:\r
                 self._Postbuild = ''\r
         return self._Postbuild\r
 \r
     ## Retrieve FLASH_DEFINITION\r
     def _GetBuildNumber(self):\r
-        if self._BuildNumber == None:\r
-            if self._Header == None:\r
+        if self._BuildNumber is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
-            if self._BuildNumber == None:\r
+            if self._BuildNumber is None:\r
                 self._BuildNumber = ''\r
         return self._BuildNumber\r
 \r
     ## Retrieve MAKEFILE_NAME\r
     def _GetMakefileName(self):\r
-        if self._MakefileName == None:\r
-            if self._Header == None:\r
+        if self._MakefileName is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
-            if self._MakefileName == None:\r
+            if self._MakefileName is None:\r
                 self._MakefileName = ''\r
         return self._MakefileName\r
 \r
     ## Retrieve BsBaseAddress\r
     def _GetBsBaseAddress(self):\r
-        if self._BsBaseAddress == None:\r
-            if self._Header == None:\r
+        if self._BsBaseAddress is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
-            if self._BsBaseAddress == None:\r
+            if self._BsBaseAddress is None:\r
                 self._BsBaseAddress = ''\r
         return self._BsBaseAddress\r
 \r
     ## Retrieve RtBaseAddress\r
     def _GetRtBaseAddress(self):\r
-        if self._RtBaseAddress == None:\r
-            if self._Header == None:\r
+        if self._RtBaseAddress is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
-            if self._RtBaseAddress == None:\r
+            if self._RtBaseAddress is None:\r
                 self._RtBaseAddress = ''\r
         return self._RtBaseAddress\r
 \r
     ## Retrieve the top address for the load fix address\r
     def _GetLoadFixAddress(self):\r
-        if self._LoadFixAddress == None:\r
-            if self._Header == None:\r
+        if self._LoadFixAddress is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
 \r
-            if self._LoadFixAddress == None:\r
+            if self._LoadFixAddress is None:\r
                 self._LoadFixAddress = self._Macros.get(TAB_FIX_LOAD_TOP_MEMORY_ADDRESS, '0')\r
 \r
             try:\r
@@ -608,33 +608,33 @@ class DscBuildData(PlatformBuildClassObject):
 \r
     ## Retrieve RFCLanguage filter\r
     def _GetRFCLanguages(self):\r
-        if self._RFCLanguages == None:\r
-            if self._Header == None:\r
+        if self._RFCLanguages is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
-            if self._RFCLanguages == None:\r
+            if self._RFCLanguages is None:\r
                 self._RFCLanguages = []\r
         return self._RFCLanguages\r
 \r
     ## Retrieve ISOLanguage filter\r
     def _GetISOLanguages(self):\r
-        if self._ISOLanguages == None:\r
-            if self._Header == None:\r
+        if self._ISOLanguages is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
-            if self._ISOLanguages == None:\r
+            if self._ISOLanguages is None:\r
                 self._ISOLanguages = []\r
         return self._ISOLanguages\r
     ## Retrieve the GUID string for VPD tool\r
     def _GetVpdToolGuid(self):\r
-        if self._VpdToolGuid == None:\r
-            if self._Header == None:\r
+        if self._VpdToolGuid is None:\r
+            if self._Header is None:\r
                 self._GetHeaderInfo()\r
-            if self._VpdToolGuid == None:\r
+            if self._VpdToolGuid is None:\r
                 self._VpdToolGuid = ''\r
         return self._VpdToolGuid\r
 \r
     ## Retrieve [SkuIds] section information\r
     def _GetSkuIds(self):\r
-        if self._SkuIds == None:\r
+        if self._SkuIds is None:\r
             self._SkuIds = sdict()\r
             RecordList = self._RawData[MODEL_EFI_SKU_ID, self._Arch]\r
             for Record in RecordList:\r
@@ -646,7 +646,7 @@ class DscBuildData(PlatformBuildClassObject):
                                     File=self.MetaFile, Line=Record[-1])\r
                 Pattern = re.compile('^[1-9]\d*|0$')\r
                 HexPattern = re.compile(r'0[xX][0-9a-fA-F]+$')\r
-                if Pattern.match(Record[0]) == None and HexPattern.match(Record[0]) == None:\r
+                if Pattern.match(Record[0]) is None and HexPattern.match(Record[0]) is None:\r
                     EdkLogger.error('build', FORMAT_INVALID, "The format of the Sku ID number is invalid. It only support Integer and HexNumber",\r
                                     File=self.MetaFile, Line=Record[-1])\r
                 if not IsValidWord(Record[1]):\r
@@ -661,7 +661,7 @@ class DscBuildData(PlatformBuildClassObject):
     def ToInt(self,intstr):\r
         return int(intstr,16) if intstr.upper().startswith("0X") else int(intstr)\r
     def _GetDefaultStores(self):\r
-        if self.DefaultStores == None:\r
+        if self.DefaultStores is None:\r
             self.DefaultStores = sdict()\r
             RecordList = self._RawData[MODEL_EFI_DEFAULT_STORES, self._Arch]\r
             for Record in RecordList:\r
@@ -673,7 +673,7 @@ class DscBuildData(PlatformBuildClassObject):
                                     File=self.MetaFile, Line=Record[-1])\r
                 Pattern = re.compile('^[1-9]\d*|0$')\r
                 HexPattern = re.compile(r'0[xX][0-9a-fA-F]+$')\r
-                if Pattern.match(Record[0]) == None and HexPattern.match(Record[0]) == None:\r
+                if Pattern.match(Record[0]) is None and HexPattern.match(Record[0]) is None:\r
                     EdkLogger.error('build', FORMAT_INVALID, "The format of the DefaultStores ID number is invalid. It only support Integer and HexNumber",\r
                                     File=self.MetaFile, Line=Record[-1])\r
                 if not IsValidWord(Record[1]):\r
@@ -689,7 +689,7 @@ class DscBuildData(PlatformBuildClassObject):
 \r
     ## Retrieve [Components] section information\r
     def _GetModules(self):\r
-        if self._Modules != None:\r
+        if self._Modules is not None:\r
             return self._Modules\r
 \r
         self._Modules = sdict()\r
@@ -788,13 +788,13 @@ class DscBuildData(PlatformBuildClassObject):
 \r
     ## Retrieve all possible library instances used in this platform\r
     def _GetLibraryInstances(self):\r
-        if self._LibraryInstances == None:\r
+        if self._LibraryInstances is None:\r
             self._GetLibraryClasses()\r
         return self._LibraryInstances\r
 \r
     ## Retrieve [LibraryClasses] information\r
     def _GetLibraryClasses(self):\r
-        if self._LibraryClasses == None:\r
+        if self._LibraryClasses is None:\r
             self._LibraryInstances = []\r
             #\r
             # tdict is a special dict kind of type, used for selecting correct\r
@@ -832,7 +832,7 @@ class DscBuildData(PlatformBuildClassObject):
                 # try all possible module types\r
                 for ModuleType in SUP_MODULE_LIST:\r
                     LibraryInstance = LibraryClassDict[self._Arch, ModuleType, LibraryClass]\r
-                    if LibraryInstance == None:\r
+                    if LibraryInstance is None:\r
                         continue\r
                     self._LibraryClasses[LibraryClass, ModuleType] = LibraryInstance\r
 \r
@@ -859,7 +859,7 @@ class DscBuildData(PlatformBuildClassObject):
         return self._LibraryClasses\r
 \r
     def _ValidatePcd(self, PcdCName, TokenSpaceGuid, Setting, PcdType, LineNo):\r
-        if self._DecPcds == None:\r
+        if self._DecPcds is None:\r
 \r
             FdfInfList = []\r
             if GlobalData.gFdfParser:\r
@@ -1121,7 +1121,7 @@ class DscBuildData(PlatformBuildClassObject):
 \r
     ## Retrieve all PCD settings in platform\r
     def _GetPcds(self):\r
-        if self._Pcds == None:\r
+        if self._Pcds is None:\r
             self._Pcds = sdict()\r
             self.__ParsePcdFromCommandLine()\r
             self._Pcds.update(self._GetPcd(MODEL_PCD_FIXED_AT_BUILD))\r
@@ -1156,7 +1156,7 @@ class DscBuildData(PlatformBuildClassObject):
                     print "PcdCName: %s, SkuName: %s, Value: %s" % (".".join((pcdobj.TokenSpaceGuidCName, pcdobj.TokenCName)), skuid,str(pcdobj.SkuInfoList[skuid].DefaultValue))\r
     ## Retrieve [BuildOptions]\r
     def _GetBuildOptions(self):\r
-        if self._BuildOptions == None:\r
+        if self._BuildOptions is None:\r
             self._BuildOptions = sdict()\r
             #\r
             # Retrieve build option for EDKII and EDK style module\r
@@ -1178,7 +1178,7 @@ class DscBuildData(PlatformBuildClassObject):
         return self._BuildOptions\r
 \r
     def GetBuildOptionsByModuleType(self, Edk, ModuleType):\r
-        if self._ModuleTypeOptions == None:\r
+        if self._ModuleTypeOptions is None:\r
             self._ModuleTypeOptions = sdict()\r
         if (Edk, ModuleType) not in self._ModuleTypeOptions:\r
             options = sdict()\r
@@ -1471,7 +1471,7 @@ class DscBuildData(PlatformBuildClassObject):
 \r
         for PcdCName, TokenSpaceGuid, SkuName, Dummy4 in PcdSet:\r
             Setting = PcdDict[self._Arch, PcdCName, TokenSpaceGuid, SkuName]\r
-            if Setting == None:\r
+            if Setting is None:\r
                 continue\r
             PcdValue, DatumType, MaxDatumSize = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
             if (PcdCName, TokenSpaceGuid) in PcdValueDict:\r
@@ -2256,7 +2256,7 @@ class DscBuildData(PlatformBuildClassObject):
         for PcdCName, TokenSpaceGuid, SkuName, Dummy4 in PcdList:\r
 \r
             Setting = PcdDict[self._Arch, SkuName, PcdCName, TokenSpaceGuid]\r
-            if Setting == None:\r
+            if Setting is None:\r
                 continue\r
 \r
             PcdValue, DatumType, MaxDatumSize = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
@@ -2428,7 +2428,7 @@ class DscBuildData(PlatformBuildClassObject):
         for PcdCName, TokenSpaceGuid, SkuName,DefaultStore, Dummy4 in PcdSet:\r
 \r
             Setting = PcdDict[self._Arch, SkuName, PcdCName, TokenSpaceGuid,DefaultStore]\r
-            if Setting == None:\r
+            if Setting is None:\r
                 continue\r
             VariableName, VariableGuid, VariableOffset, DefaultValue, VarAttribute = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
 \r
@@ -2498,7 +2498,7 @@ class DscBuildData(PlatformBuildClassObject):
             pcd.DatumType = pcdDecObject.DatumType\r
             # Only fix the value while no value provided in DSC file.\r
             for sku in pcd.SkuInfoList.values():\r
-                if (sku.HiiDefaultValue == "" or sku.HiiDefaultValue == None):\r
+                if (sku.HiiDefaultValue == "" or sku.HiiDefaultValue is None):\r
                     sku.HiiDefaultValue = pcdDecObject.DefaultValue\r
                     for default_store in sku.DefaultStoreDict:\r
                         sku.DefaultStoreDict[default_store]=pcdDecObject.DefaultValue\r
@@ -2582,7 +2582,7 @@ class DscBuildData(PlatformBuildClassObject):
         # Remove redundant PCD candidates, per the ARCH and SKU\r
         for PcdCName, TokenSpaceGuid, SkuName, Dummy4 in PcdList:\r
             Setting = PcdDict[self._Arch, SkuName, PcdCName, TokenSpaceGuid]\r
-            if Setting == None:\r
+            if Setting is None:\r
                 continue\r
             #\r
             # For the VOID* type, it can have optional data of MaxDatumSize and InitialValue\r
@@ -2691,7 +2691,7 @@ class DscBuildData(PlatformBuildClassObject):
         self.Pcds[Name, Guid].DefaultValue = Value\r
     @property\r
     def DecPcds(self):\r
-        if self._DecPcds == None:\r
+        if self._DecPcds is None:\r
             FdfInfList = []\r
             if GlobalData.gFdfParser:\r
                 FdfInfList = GlobalData.gFdfParser.Profile.InfList\r