the __iter__ method on historyarraylist seemed to get broked...hmmmm

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index 9369a7270..c2fc5e37b 100644
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -294,8 +294,8 @@ class HistoryArraySet(UserList.UserList):
         else:
             self.data = []
         self.readonly=readonly
-#    def __iter__(self):
-#        return iter([k for k in self.records if self.records[k] is not False])
+    def __iter__(self):
+        return iter(self.data)
     def __getattr__(self, attr):
         """proxies unknown HistoryArraySet methods and attributes to the underlying
         data array.  this allows custom list classes to be used."""
@@ -397,7 +397,7 @@ class HistoryArraySet(UserList.UserList):
             del self.records[item]
             self.data.remove(item)
     def has_item(self, item):
-        return self.records.has_key(item)
+        return self.records.has_key(item) and self.records[item] is not False
     def __setitem__(self, i, item): 
         if self._setrecord(item):
             self.data[i] = item