From 29a957d04a9af8ffdfea385e2b53f3383bda3776 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 24 Aug 2008 17:39:14 +0000 Subject: [PATCH] Merged from trunk 11465:11467 | 11466 | Avoid possible AttributeError raised from | | zmedico | _ObjectKey.__eq__(). | | 11467 | * Fix broken _ObjectKey.__eq__() logic from previous commit. | | zmedico | * Define _ObjectKey.__slots__ to save memory. | svn path=/main/branches/prefix/; revision=11468 --- pym/portage/dbapi/vartree.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 0a8f82a7a..c1aba2a9c 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,7 +169,11 @@ class LinkageMap(object): return hash(self._key) def __eq__(self, other): - 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): """ -- 2.26.2