BaseTools: AutoGen - use defaultdict to auto initialize

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/GenVar.py b/BaseTools/Source/Python/AutoGen/GenVar.py
index 3dae16efd0f557bc9c4a7cffa94cc3f8433db445..13bcf99b2627b410fa7274ad824a63b4cdee4baa 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenVar.py
+++ b/BaseTools/Source/Python/AutoGen/GenVar.py
@@ -128,7 +128,7 @@ class VariableMgr(object):
         return var_value\r
     def process_variable_data(self):\r
 \r
-        var_data = dict()\r
+        var_data = collections.defaultdict(collections.OrderedDict)\r
 \r
         indexedvarinfo = collections.OrderedDict()\r
         for item in self.VarInfo:\r
@@ -155,8 +155,6 @@ class VariableMgr(object):
             for item in default_data_buffer:\r
                 default_data_array += unpack("B",item)\r
 \r
-            if (DataType.TAB_DEFAULT,DataType.TAB_DEFAULT_STORES_DEFAULT) not in var_data:\r
-                var_data[(DataType.TAB_DEFAULT,DataType.TAB_DEFAULT_STORES_DEFAULT)] = collections.OrderedDict()\r
             var_data[(DataType.TAB_DEFAULT,DataType.TAB_DEFAULT_STORES_DEFAULT)][index] = (default_data_buffer,sku_var_info[(DataType.TAB_DEFAULT,DataType.TAB_DEFAULT_STORES_DEFAULT)])\r
 \r
             for (skuid,defaultstoragename) in indexedvarinfo.get(index):\r
@@ -177,8 +175,6 @@ class VariableMgr(object):
 \r
                 data_delta = self.calculate_delta(default_data_array, others_data_array)\r
 \r
-                if (skuid,defaultstoragename) not in var_data:\r
-                    var_data[(skuid,defaultstoragename)] = collections.OrderedDict()\r
                 var_data[(skuid,defaultstoragename)][index] = (data_delta,sku_var_info[(skuid,defaultstoragename)])\r
         return var_data\r
 \r