items: Use BaseItem.__hash__ and six.add_metaclass decorator

This commit is contained in:
Daniel Graña 2014-07-24 15:37:10 -03:00
parent dbc9b37365
commit 6d215a1b34
1 changed files with 4 additions and 8 deletions

View File

@ -76,14 +76,9 @@ class DictItem(MutableMapping, BaseItem):
return len(self._values)
def __iter__(self):
for i in getattr(self, "_values", ()):
yield i
return iter(self._values)
def __hash__(self):
if hasattr(self, "_values"):
return hash(frozenset(self._values.items()))
else:
return 1
__hash__ = BaseItem.__hash__
def keys(self):
return self._values.keys()
@ -95,5 +90,6 @@ class DictItem(MutableMapping, BaseItem):
return self.__class__(self)
class Item(six.with_metaclass(ItemMeta, DictItem)):
@six.add_metaclass(ItemMeta)
class Item(DictItem):
pass