diff options
Diffstat (limited to 'minidinstall/OrderedDict.py')
| -rw-r--r-- | minidinstall/OrderedDict.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/minidinstall/OrderedDict.py b/minidinstall/OrderedDict.py index fa3f276..7c842b0 100644 --- a/minidinstall/OrderedDict.py +++ b/minidinstall/OrderedDict.py @@ -20,7 +20,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -from UserDict import UserDict +from collections import UserDict class OrderedDict(UserDict): __order=[] @@ -41,12 +41,12 @@ class OrderedDict(UserDict): return UserDict.__cmp__(self, dict) def __setitem__(self, key, value): - if not self.has_key(key): + if key not in self: self.__order.append(key) UserDict.__setitem__(self, key, value) def __delitem__(self, key): - if self.has_key(key): + if key in self: del self.__order[self.__order.index(key)] UserDict.__delitem__(self, key) @@ -64,13 +64,13 @@ class OrderedDict(UserDict): return self.__order def items(self): - return map(lambda x, self=self: (x, self.__getitem__(x)), self.__order) + return list(map(lambda x, self=self: (x, self.__getitem__(x)), self.__order)) def values(self): - return map(lambda x, self=self: self.__getitem__(x), self.__order) + return list(map(lambda x, self=self: self.__getitem__(x), self.__order)) def update(self, dict): - for k, v in dict.items(): + for k, v in list(dict.items()): self.__setitem__(k, v) # vim:ts=4:sw=4:et: |