From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 12 Jul 2008 00:03:01 +0000 (-0000)
Subject: For subclasses of Task, explicitly assign __hash__ = Task.__hash__ for
X-Git-Tag: v2.2_rc2~125
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=36f15d83c7d65976cde18dd08cf792b949e2334b;p=portage.git

For subclasses of Task, explicitly assign __hash__ = Task.__hash__ for
compatibility with python-2.6_beta. Thanks to Arfrever for reporting.

svn path=/main/trunk/; revision=11020
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index ff5c3d585..5dbb44795 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1288,6 +1288,8 @@ class Task(SlotObject):
 		return str(self._get_hash_key())
 
 class Blocker(Task):
+
+	__hash__ = Task.__hash__
 	__slots__ = ("root", "atom", "cp", "satisfied")
 
 	def __init__(self, **kwargs):
@@ -1302,6 +1304,8 @@ class Blocker(Task):
 		return self._hash_key
 
 class Package(Task):
+
+	__hash__ = Task.__hash__
 	__slots__ = ("built", "cpv", "depth",
 		"installed", "metadata", "onlydeps", "operation",
 		"root_config", "type_name",
@@ -2658,6 +2662,7 @@ class EbuildMerge(SlotObject):
 
 class PackageUninstall(Task):
 
+	__hash__ = Task.__hash__
 	__slots__ = ("ldpath_mtimes", "opts", "pkg", "settings")
 
 	def _get_hash_key(self):