From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 24 Aug 2008 17:32:19 +0000 (-0000)
Subject: * Fix broken _ObjectKey.__eq__() logic from previous commit.
X-Git-Tag: v2.2_rc9~52
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=12ab9b31ccb72186c55f7021ca836f95a2187a12;p=portage.git

* Fix broken _ObjectKey.__eq__() logic from previous commit.
* Define _ObjectKey.__slots__ to save memory.

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index b3eefe8c4..598845e0b 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -153,6 +153,8 @@ class LinkageMap(object):
 
 		"""Helper class used as _obj_properties keys for objects."""
 
+		__slots__ = ("__weakref__", "_key")
+
 		def __init__(self, object):
 			"""
 			This takes a path to an object.
@@ -167,9 +169,11 @@ class LinkageMap(object):
 			return hash(self._key)
 
 		def __eq__(self, other):
-			if not isinstance(other, self.__class__):
-				return False
-			return self._key == other._key
+			if isinstance(other, self.__class__):
+				other_key = other._key
+			else:
+				other_key = other
+			return self._key == other_key
 
 		def _generate_object_key(self, object):
 			"""