- fix a dict while iterate mutation

- illustrate how OrderedDict can catch these, but commented out
to save function overhead

2 files changed, 12 insertions, 1 deletions

diff --git a/lib/sqlalchemy/ext/declarative/base.py b/lib/sqlalchemy/ext/declarative/base.py
index 9187ed7f8..5a2b88db4 100644
--- a/lib/sqlalchemy/ext/declarative/base.py
+++ b/lib/sqlalchemy/ext/declarative/base.py
@@ -173,7 +173,7 @@ def _as_declarative(cls, classname, dict_):
 
     # extract columns from the class dict
     declared_columns = set()
-    for key, c in our_stuff.items():
+    for key, c in list(our_stuff.items()):
         if isinstance(c, (ColumnProperty, CompositeProperty)):
             for col in c.columns:
                 if isinstance(col, Column) and \
diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py
index ed9ecfedc..5991fc8a4 100644
--- a/lib/sqlalchemy/util/_collections.py
+++ b/lib/sqlalchemy/util/_collections.py
@@ -261,6 +261,14 @@ class OrderedDict(dict):
     def __iter__(self):
         return iter(self._list)
 
+
+    #def __iter__(self):
+    #    len_ = len(self._list)
+    #    for item in self._list:
+    #        yield item
+    #        assert len_ == len(self._list), \
+    #           "Dictionary changed size during iteration"
+
     if py2k:
         def values(self):
             return [self[key] for key in self._list]
@@ -281,12 +289,15 @@ class OrderedDict(dict):
             return [(key, self[key]) for key in self._list]
     else:
         def values(self):
+            #return (self[key] for key in self)
             return (self[key] for key in self._list)
 
         def keys(self):
+            #return iter(self)
             return iter(self._list)
 
         def items(self):
+            #return ((key, self[key]) for key in self)
             return ((key, self[key]) for key in self._list)
 
     def __setitem__(self, key, object):