Revert r444 as it is giving errors with keys...

2 files changed, 22 insertions, 85 deletions

diff --git a/lib/bb/data.py b/lib/bb/data.py
index 9cbc2eaa3..55d1cc905 100644
--- a/lib/bb/data.py
+++ b/lib/bb/data.py
@@ -460,10 +460,10 @@ def update_data(d):
         l    = len(o)+1
 
         # see if one should even try
-        if not o in d._seen_overrides.keys():
+        if not o in d._seen_overrides:
             continue
 
-        vars = d._seen_overrides.get(o)
+        vars = d._seen_overrides[o]
         for var in vars:
             name = var[:-l]
             try:
@@ -472,8 +472,8 @@ def update_data(d):
                 note ("Untracked delVar")
 
     # now on to the appends and prepends
-    if '_append' in d._special_values.keys():
-        appends = d._special_values.get('_append') or []
+    if '_append' in d._special_values:
+        appends = d._special_values['_append'] or []
         for append in appends:
             for (a, o) in getVarFlag(append, '_append', d) or []:
                 # maybe the OVERRIDE was not yet added so keep the append
@@ -487,8 +487,8 @@ def update_data(d):
                 setVar(append, sval, d)
 
 
-    if '_prepend' in d._special_values.keys():
-        prepends = d._special_values.get('_prepend') or []
+    if '_prepend' in d._special_values:
+        prepends = d._special_values['_prepend'] or []
 
         for prepend in prepends:
             for (a, o) in getVarFlag(prepend, '_prepend', d) or []:
diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py
index 01d38914d..c29ab59b6 100644
--- a/lib/bb/data_smart.py
+++ b/lib/bb/data_smart.py
@@ -44,84 +44,13 @@ __expand_var_regexp__ = re.compile(r"\${[^{}]+}")
 __expand_python_regexp__ = re.compile(r"\${@.+?}")
 
 
-#=====
-#
-# Helper Class
-#
-#====
-class ParentDictSet:
-    """
-    To avoid DeepCopies of shared dictionaries
-    we use a COW/parenting pattern.
-
-    This class looks like a dictionary. If we
-    set a key that is also present in the parent
-    we will make a copy of it.
-
-    Currently it is not possible to remove keys
-    """
-
-    def __init__(self, parent=None):
-        self._dict = {}
-
-        #set the parent of this dict
-        #and save the lists of keys
-        if parent:
-            self._dict['_PARENT_OF_DICT'] = parent._dict
-            self._keys = parent._keys
-        else:
-            self._keys = []
-
-    def _crazy_lookup(self, dict, name):
-        # crazy lookup
-        while dict:
-            if name in dict:
-                return (dict[name],True)
-            elif '_PARENT_OF_DICT' in dict:
-                dict = dict['_PARENT_OF_DICT']
-            else:
-                break
-
-        return (None,False)
-
-
-    def get(self, name):
-        (var,found) = self._crazy_lookup(self._dict, name)
-
-        return var
-
-    def add(self, name, value):
-        #
-        # Check if we have the key already locally
-        #
-        if name in self._dict:
-            self._dict[name].add( value )
-            return
-
-        #
-        # Check if the key is used by our parent
-        #
-        if '_PARENT_OF_DICT' in self._dict:
-            (var,found) = self._crazy_lookup(self._dict['_PARENT_OF_DICT'], name)
-            if found:
-                self._dict[name] = copy.copy(var)
-                self._dict[name].add(value)
-        else:
-            # a new name is born
-            self._keys.append(name)
-            self._dict[name] = Set()
-            self._dict[name].add(value)
-
-    def keys(self):
-        return self._keys
-
 class DataSmart:
     def __init__(self):
         self.dict = {}
 
         # cookie monster tribute
-        self._special_values = ParentDictSet()
-        self._seen_overrides = ParentDictSet()
+        self._special_values = {}
+        self._seen_overrides = {}
 
     def expand(self,s, varname):
         def var_sub(match):
@@ -200,8 +129,16 @@ class DataSmart:
             self.setVarFlag(base, keyword, l)
 
             # pay the cookie monster
-            self._special_values.add( keyword, base )
+            try:
+                self._special_values[keyword].add( base )
+            except:
+                self._special_values[keyword] = Set()
+                self._special_values[keyword].add( base )
 
+            # SRC_URI_append_simpad is both a flag and a override
+            #if not override in self._seen_overrides:
+            #    self._seen_overrides[override] = Set()
+            #self._seen_overrides[override].add( base )
             return
 
         if not var in self.dict:
@@ -213,7 +150,9 @@ class DataSmart:
         # more cookies for the cookie monster
         if '_' in var:
             override = var[var.rfind('_')+1:]
-            self._seen_overrides.add( override, var )
+            if not override in self._seen_overrides:
+                self._seen_overrides[override] = Set()
+            self._seen_overrides[override].add( var )
 
         # setting var
         self.dict[var]["content"] = value
@@ -297,10 +236,8 @@ class DataSmart:
         # we really want this to be a DataSmart...
         data = DataSmart()
         data.dict["_data"] = self.dict
-
-        # reparent the dicts
-        data._seen_overrides = ParentDictSet(self._seen_overrides)
-        data._special_values = ParentDictSet(self._special_values)
+        data._seen_overrides = copy.deepcopy(self._seen_overrides)
+        data._special_values = copy.deepcopy(self._special_values)
 
         return data