From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SmvSU-0008D0-Dw for garchives@archives.gentoo.org; Thu, 05 Jul 2012 23:27:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C6C7E073A; Thu, 5 Jul 2012 23:27:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0088DE073A for ; Thu, 5 Jul 2012 23:27:10 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 072F71B401A for ; Thu, 5 Jul 2012 23:27:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BA8CFE543C for ; Thu, 5 Jul 2012 23:27:08 +0000 (UTC) From: "Slava Bacherikov" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slava Bacherikov" Message-ID: <1341492942.920ccab8e4332e74a12bebb75a75445ceb60c1c1.bacher09@gentoo> Subject: [gentoo-commits] proj/gentoo-packages:master commit in: gpackages/libs/package_info/, gpackages/libs/package_info/generic_metadata/ X-VCS-Repository: proj/gentoo-packages X-VCS-Files: gpackages/libs/package_info/generic_metadata/herds.py gpackages/libs/package_info/generic_metadata/repo_info.py gpackages/libs/package_info/generic_objects.py X-VCS-Directories: gpackages/libs/package_info/ gpackages/libs/package_info/generic_metadata/ X-VCS-Committer: bacher09 X-VCS-Committer-Name: Slava Bacherikov X-VCS-Revision: 920ccab8e4332e74a12bebb75a75445ceb60c1c1 X-VCS-Branch: master Date: Thu, 5 Jul 2012 23:27:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 272982ea-4362-4bbc-92fd-a7413170ca09 X-Archives-Hash: d2774edd9e79a03f54956b04bb033169 commit: 920ccab8e4332e74a12bebb75a75445ceb60c1c1 Author: Slava Bacherikov bacher09 org> AuthorDate: Thu Jul 5 12:55:42 2012 +0000 Commit: Slava Bacherikov bacherikov org ua> CommitDate: Thu Jul 5 12:55:42 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoo-packag= es.git;a=3Dcommit;h=3D920ccab8 Update comparison functions --- .../libs/package_info/generic_metadata/herds.py | 4 +++- .../package_info/generic_metadata/repo_info.py | 4 ++++ gpackages/libs/package_info/generic_objects.py | 8 +++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gpackages/libs/package_info/generic_metadata/herds.py b/gpac= kages/libs/package_info/generic_metadata/herds.py index ee1475f..1fe30cb 100644 --- a/gpackages/libs/package_info/generic_metadata/herds.py +++ b/gpackages/libs/package_info/generic_metadata/herds.py @@ -57,10 +57,12 @@ class Herd(AbstractXmlObject, ToStrMixin): self._xml_object =3D xml_object =20 def __eq__(self, other): + if not isinstance(other, Herd): + return False return self.name =3D=3D other.name =20 def __ne__(self, other): - return self.name !=3D other.name + return not self.__eq__(other) =20 def __hash__(self): return hash(self.name) diff --git a/gpackages/libs/package_info/generic_metadata/repo_info.py b/= gpackages/libs/package_info/generic_metadata/repo_info.py index 9bcb22d..1af8e14 100644 --- a/gpackages/libs/package_info/generic_metadata/repo_info.py +++ b/gpackages/libs/package_info/generic_metadata/repo_info.py @@ -66,9 +66,13 @@ class SourcesObject(ToStrMixin): return hash(self.source_url) =20 def __eq__(self, other): + if not isinstance(other, SourcesObject): + return False return self.source_url =3D=3D other.source_url =20 def __lt__(self, other): + if not isinstance(other, SourcesObject): + return NotImplemented return self.source_url < other.source_url =20 @property diff --git a/gpackages/libs/package_info/generic_objects.py b/gpackages/l= ibs/package_info/generic_objects.py index b80cef6..8c8e2aa 100644 --- a/gpackages/libs/package_info/generic_objects.py +++ b/gpackages/libs/package_info/generic_objects.py @@ -21,10 +21,12 @@ class Use(ToStrMixin, AbstractUse): return self.name =20 def __eq__(self, other): + if not isinstance(other, self): + return False return self.name =3D=3D other.name =20 def __ne__(self, other): - return self.name !=3D other.name + return not self.__eq__(other) =20 def __hash__(self): return hash(self.name) @@ -69,9 +71,13 @@ class Keyword(ToStrMixin, AbstractKeywords): return self.status > other.status =20 def __eq__(self, other): + if not isinstance(other, Keyword): + return False return (self.arch, self.status) =3D=3D (other.arch, other.status= ) =20 def __lt__(self, other): + if not isinstance(other, Keyword): + return NotImplemented return (self.status, self.arch) > (other.status, other.arch) =20 @property