From: Mike Bayer Date: Tue, 20 Sep 2005 07:04:26 +0000 (+0000) Subject: (no commit message) X-Git-Tag: rel_0_1_0~660 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac7965ae2d11eb8cf770c362f90c82e1cb9d3676;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git --- diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py index 3d5ca1bb4a..0ee43be01c 100644 --- a/lib/sqlalchemy/util.py +++ b/lib/sqlalchemy/util.py @@ -55,6 +55,10 @@ class OrderedDict(dict): def keys(self): return self.list + def clear(self): + self.list = [] + dict.clear(self) + def update(self, dict): for key in dict.keys(): self.__setitem__(key, dict[key]) @@ -80,6 +84,13 @@ class OrderedDict(dict): def iteritems(self): return iter([(key, self[key]) for key in self.keys()]) + def __delitem__(self, key): + try: + del self.list[self.list.index(key)] + except ValueError: + raise KeyError(key) + dict.__delitem__(self, key) + def __setitem__(self, key, object): if not self.has_key(key): self.list.append(key) @@ -110,6 +121,7 @@ class HashSet(object): if iter is not None: for i in iter: self.append(i) + def __iter__(self): return iter(self.map.values())