BaseTools: Remove equality operator with None

[mirror_edk2.git] / BaseTools / Source / Python / CommonDataClass / CommonClass.py

diff --git a/BaseTools/Source/Python/CommonDataClass/CommonClass.py b/BaseTools/Source/Python/CommonDataClass/CommonClass.py
index bb4b434af8f03c656f04f1bd8571ed6293e295e6..6a8262e5e964962e97a60caa75c77cea2c60af4c 100644 (file)
--- a/BaseTools/Source/Python/CommonDataClass/CommonClass.py
+++ b/BaseTools/Source/Python/CommonDataClass/CommonClass.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is used to define common items of class object\r
 #\r
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.    The full text of the license may be found at\r
@@ -44,11 +44,11 @@ def GenerateHelpText(Text, Lang):
 class CommonClass(object):\r
     def __init__(self, Usage = None, FeatureFlag = '', SupArchList = None, HelpText = ''):\r
         self.Usage = Usage\r
-        if self.Usage == None:\r
+        if self.Usage is None:\r
             self.Usage = []\r
         self.FeatureFlag = FeatureFlag\r
         self.SupArchList = SupArchList\r
-        if self.SupArchList == None:\r
+        if self.SupArchList is None:\r
             self.SupArchList = []\r
         self.HelpText = HelpText\r
         self.HelpTextList = []\r
@@ -174,7 +174,7 @@ class IncludeStatementClass(object):
 # @var GuidTypeList:   To store value for GuidTypeList, selection scope is in below list\r
 #                      DATA_HUB_RECORD | EFI_EVENT | EFI_SYSTEM_CONFIGURATION_TABLE | EFI_VARIABLE | GUID | HII_PACKAGE_LIST | HOB | TOKEN_SPACE_GUID\r
 # @var SupModuleList:  To store value for SupModuleList, selection scope is in below list\r
-#                      BASE | SEC | PEI_CORE | PEIM | DXE_CORE | DXE_DRIVER | DXE_RUNTIME_DRIVER | DXE_SAL_DRIVER | DXE_SMM_DRIVER | UEFI_DRIVER | UEFI_APPLICATION | USER_DEFINED | SMM_CORE\r
+#                      BASE | SEC | PEI_CORE | PEIM | DXE_CORE | DXE_DRIVER | DXE_RUNTIME_DRIVER | DXE_SAL_DRIVER | DXE_SMM_DRIVER | UEFI_DRIVER | UEFI_APPLICATION | USER_DEFINED | SMM_CORE | MM_STANDALONE | MM_CORE_STANDALONE\r
 #\r
 class GuidProtocolPpiCommonClass(CommonClass):\r
     def __init__(self):\r
@@ -202,7 +202,7 @@ class GuidProtocolPpiCommonClass(CommonClass):
 # @var RecommendedInstance:         To store value for RecommendedInstance, selection scope is in below list\r
 #                                   DATA_HUB_RECORD | EFI_EVENT | EFI_SYSTEM_CONFIGURATION_TABLE | EFI_VARIABLE | GUID | HII_PACKAGE_LIST | HOB | TOKEN_SPACE_GUID\r
 # @var SupModuleList:               To store value for SupModuleList, selection scope is in below list\r
-#                                   BASE | SEC | PEI_CORE | PEIM | DXE_CORE | DXE_DRIVER | DXE_RUNTIME_DRIVER | DXE_SAL_DRIVER | DXE_SMM_DRIVER | UEFI_DRIVER | UEFI_APPLICATION | USER_DEFINED | SMM_CORE\r
+#                                   BASE | SEC | PEI_CORE | PEIM | DXE_CORE | DXE_DRIVER | DXE_RUNTIME_DRIVER | DXE_SAL_DRIVER | DXE_SMM_DRIVER | UEFI_DRIVER | UEFI_APPLICATION | USER_DEFINED | SMM_CORE | MM_STANDALONE | MM_CORE_STANDALONE\r
 #\r
 class LibraryClassClass(CommonClass, DefineClass):\r
     def __init__(self):\r
@@ -270,18 +270,22 @@ class PpiClass(GuidProtocolPpiCommonClass):
 #\r
 class SkuInfoClass(object):\r
     def __init__(self, SkuIdName = '', SkuId = '', VariableName = '', VariableGuid = '', VariableOffset = '', \r
-                 HiiDefaultValue = '', VpdOffset = '', DefaultValue = '', VariableGuidValue = ''):\r
+                 HiiDefaultValue = '', VpdOffset = '', DefaultValue = '', VariableGuidValue = '', VariableAttribute = '', DefaultStore = None):\r
         self.SkuIdName = SkuIdName\r
         self.SkuId = SkuId\r
         \r
         #\r
         # Used by Hii\r
         #\r
+        if DefaultStore is None:\r
+            DefaultStore = {}\r
         self.VariableName = VariableName\r
         self.VariableGuid = VariableGuid\r
         self.VariableGuidValue = VariableGuidValue\r
         self.VariableOffset = VariableOffset\r
         self.HiiDefaultValue = HiiDefaultValue\r
+        self.VariableAttribute = VariableAttribute\r
+        self.DefaultStoreDict = DefaultStore\r
         \r
         #\r
         # Used by Vpd\r
@@ -353,7 +357,7 @@ class PcdErrorClass(object):
 # @var SkuInfoList:            To store value for SkuInfoList\r
 #                              It is a set structure as { [SkuIdName] : SkuInfoClass } \r
 # @var SupModuleList:          To store value for SupModuleList, selection scope is in below list\r
-#                              BASE | SEC | PEI_CORE | PEIM | DXE_CORE | DXE_DRIVER | DXE_RUNTIME_DRIVER | DXE_SAL_DRIVER | DXE_SMM_DRIVER | UEFI_DRIVER | UEFI_APPLICATION | USER_DEFINED | SMM_CORE\r
+#                              BASE | SEC | PEI_CORE | PEIM | DXE_CORE | DXE_DRIVER | DXE_RUNTIME_DRIVER | DXE_SAL_DRIVER | DXE_SMM_DRIVER | UEFI_DRIVER | UEFI_APPLICATION | USER_DEFINED | SMM_CORE | MM_STANDALONE | MM_CORE_STANDALONE\r
 #\r
 class PcdClass(CommonClass):\r
     def __init__(self, CName = '', Token = '', TokenSpaceGuidCName = '', DatumType = '', MaxDatumSize = '', DefaultValue = '', ItemType = '', ValidUsage = None, SkuInfoList = None, SupModuleList = None):\r
@@ -371,13 +375,13 @@ class PcdClass(CommonClass):
         self.PcdCName = ''\r
         self.Value = ''\r
         self.Offset = ''\r
-        if self.ValidUsage == None:\r
+        if self.ValidUsage is None:\r
             self.ValidUsage = []\r
         self.SkuInfoList = SkuInfoList\r
-        if self.SkuInfoList  == None:\r
+        if self.SkuInfoList  is None:\r
             self.SkuInfoList  = {}\r
         self.SupModuleList = SupModuleList\r
-        if self.SupModuleList == None:\r
+        if self.SupModuleList is None:\r
             self.SupModuleList = []\r
         CommonClass.__init__(self)\r
         self.PcdErrors = []\r