Change iteration through the sets, so that you don't remove something in mid-iteration.

gregturn · gregturn · commit 1245614e1433 · 2009-09-04T14:44:59.000Z
git-svn-id: https://src.springframework.org/svn/se-springpython-py/trunk/springpython@534 ce8fead1-4192-4296-8608-a705134b927f
diff --git a/src/springpython/config/__init__.py b/src/springpython/config/__init__.py
@@ -199,13 +199,34 @@ def __init__(self, name, value):
         self.logger = logging.getLogger("springpython.config.SetDef")
 
     def _replace_refs_with_actuals(self, obj, container):
+        self.logger.debug("Replacing refs with actuals...")
+        self.logger.debug("set before changes = %s" % self.value)
+        new_set = set()
         for item in self.value:
             if hasattr(item, "ref"):
-                self.value.remove(item)
-                self.value.add(container.get_object(item.ref))
+                self.logger.debug("Item !!!%s!!! is a ref, trying to replace with actual object !!!%s!!!" % (item, item.ref))
+                #self.value.remove(item)
+                #self.value.add(container.get_object(item.ref))
+                newly_fetched_value = container.get_object(item.ref)
+                new_set.add(newly_fetched_value)
+                self.logger.debug("Item !!!%s!!! was removed, and newly fetched value !!!%s!!! was added." % (item, newly_fetched_value))
+                #new_set.add(container.get_object(item.ref))
             else:
-                self.value.remove(item)
-                self.value.add(self.scan_value(container, item))
+                self.logger.debug("Item !!!%s!!! is NOT a ref, trying to replace with scanned value" % item)
+                #self.value.remove(item)
+                #self.value.add(self.scan_value(container, item))
+                newly_scanned_value = self.scan_value(container, item)
+                new_set.add(newly_scanned_value)
+                self.logger.debug("Item !!!%s!!! was removed, and newly scanned value !!!%s!!! was added." % (item, newly_scanned_value))
+                #new_set.add(self.scan_value(container, item))
+        #self.value = new_set
+        self.logger.debug("set after changes = %s" % new_set)
+        #return self.value
+        try:
+            setattr(obj, self.name, new_set)
+        except AttributeError:
+            pass
+        return new_set
 
 class FrozenSetDef(ValueDef):
     """Handles behavior for a frozen-set-based value."""
@@ -215,12 +236,12 @@ def __init__(self, name, value):
 
     def _replace_refs_with_actuals(self, obj, container):
         self.logger.debug("Replacing refs with actuals...")
-        new_set = set(self.value)
-        self.logger.debug("Just created new set %s using value %s" % (new_set, self.value))
-        for item in new_set:
+        self.logger.debug("set before changes = %s" % self.value)
+        new_set = set()
+        for item in self.value:
             if hasattr(item, "ref"):
                 self.logger.debug("Item <<<%s>>> is a ref, trying to replace with actual object <<<%s>>>" % (item, item.ref))
-                new_set.remove(item)
+                #new_set.remove(item)
                 #debug begin
                 newly_fetched_value = container.get_object(item.ref)
                 new_set.add(newly_fetched_value)
@@ -229,24 +250,23 @@ def _replace_refs_with_actuals(self, obj, container):
                 #new_set.add(container.get_object(item.ref))
             else:
                 self.logger.debug("Item <<<%s>>> is NOT a ref, trying to replace with scanned value" % item)
-                new_set.remove(item)
+                #new_set.remove(item)
                 #debug begin
                 newly_scanned_value = self.scan_value(container, item)
                 new_set.add(newly_scanned_value)
                 self.logger.debug("Item <<<%s>>> was removed, and newly scanned value <<<%s>>> was added." % (item, newly_scanned_value))
                 #debug end
                 #new_set.add(self.scan_value(container, item))
-        self.logger.debug("Newly built set = %s" % new_set)
-        frozen_set = frozenset(new_set)
-        self.logger.debug("Newly frozen set = %s" % frozen_set)
+        #self.logger.debug("Newly built set = %s" % new_set)
+        #self.value = frozenset(new_set)
+        new_frozen_set = frozenset(new_set)
+        self.logger.debug("set after changes = %s" % new_frozen_set)
+        #return self.value
         try:
-            self.logger.debug("Trying to overwrite %s's %s with %s" % (obj, self.name, frozen_set))
-            setattr(obj, self.name, frozen_set)
-        except AttributeError, e:
-            self.logger.debug("AttributeError: %s" % e)
+            setattr(obj, self.name, new_frozen_set)
+        except AttributeError:
             pass
-        self.logger.debug("Returning frozenset %s" % frozen_set)
-        return frozen_set
+        return new_frozen_set
  
 class Config(object):
     """
