From 164647b7fa04e80f3018070c2d029b22d60cb02f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 19 May 2011 23:23:51 -0700 Subject: Task: remove unnecessary _get_hash_key() method --- pym/_emerge/Task.py | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'pym/_emerge/Task.py') diff --git a/pym/_emerge/Task.py b/pym/_emerge/Task.py index 31788b576..3dd119304 100644 --- a/pym/_emerge/Task.py +++ b/pym/_emerge/Task.py @@ -1,43 +1,37 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from _emerge.SlotObject import SlotObject class Task(SlotObject): __slots__ = ("_hash_key", "_hash_value") - def _get_hash_key(self): - try: - return self._hash_key - except AttributeError: - raise NotImplementedError(self) - def __eq__(self, other): - return self._get_hash_key() == other + return self._hash_key == other def __ne__(self, other): - return self._get_hash_key() != other + return self._hash_key != other def __hash__(self): hash_value = getattr(self, "_hash_value", None) if hash_value is None: - self._hash_value = hash(self._get_hash_key()) + self._hash_value = hash(self._hash_key) return self._hash_value def __len__(self): - return len(self._get_hash_key()) + return len(self._hash_key) def __getitem__(self, key): - return self._get_hash_key()[key] + return self._hash_key[key] def __iter__(self): - return iter(self._get_hash_key()) + return iter(self._hash_key) def __contains__(self, key): - return key in self._get_hash_key() + return key in self._hash_key def __str__(self): """ Emulate tuple.__repr__, but don't show 'foo' as u'foo' for unicode strings. """ - return "(%s)" % ", ".join(("'%s'" % x for x in self._get_hash_key())) + return "(%s)" % ", ".join(("'%s'" % x for x in self._hash_key)) -- cgit v1.2.3-1-g7c22