From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 6 Apr 2006 19:25:58 +0000 (+0000)
Subject: the __iter__ method on historyarraylist seemed to get broked...hmmmm
X-Git-Tag: rel_0_1_6~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0e5bb085b052e016d75ecf8e0a24584a2de730a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

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

diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index 9369a72703..c2fc5e37be 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