Commit a61ae692 authored by Raymond Hettinger's avatar Raymond Hettinger

Use mixin methods where possible. (2.7 only -- these don't all exist in 3.0)

parent 06919a17
...@@ -69,24 +69,13 @@ class OrderedDict(dict, MutableMapping): ...@@ -69,24 +69,13 @@ class OrderedDict(dict, MutableMapping):
setdefault = MutableMapping.setdefault setdefault = MutableMapping.setdefault
update = MutableMapping.update update = MutableMapping.update
pop = MutableMapping.pop pop = MutableMapping.pop
keys = MutableMapping.keys
def keys(self): values = MutableMapping.values
return list(self.__keys) items = MutableMapping.items
iterkeys = MutableMapping.iterkeys
def values(self): itervalues = MutableMapping.itervalues
return map(self.__getitem__, self.__keys) iteritems = MutableMapping.iteritems
__ne__ = MutableMapping.__ne__
def items(self):
return zip(self.__keys, self.values())
def iterkeys(self):
return iter(self.__keys)
def itervalues(self):
return _imap(self.__getitem__, self.__keys)
def iteritems(self):
return _izip(self.__keys, _imap(self.__getitem__, self.__keys))
def __repr__(self): def __repr__(self):
if not self: if not self:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment