| 1 |
commit: 920ccab8e4332e74a12bebb75a75445ceb60c1c1 |
| 2 |
Author: Slava Bacherikov <slava <AT> bacher09 <DOT> org> |
| 3 |
AuthorDate: Thu Jul 5 12:55:42 2012 +0000 |
| 4 |
Commit: Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua> |
| 5 |
CommitDate: Thu Jul 5 12:55:42 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=920ccab8 |
| 7 |
|
| 8 |
Update comparison functions |
| 9 |
|
| 10 |
--- |
| 11 |
.../libs/package_info/generic_metadata/herds.py | 4 +++- |
| 12 |
.../package_info/generic_metadata/repo_info.py | 4 ++++ |
| 13 |
gpackages/libs/package_info/generic_objects.py | 8 +++++++- |
| 14 |
3 files changed, 14 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/gpackages/libs/package_info/generic_metadata/herds.py b/gpackages/libs/package_info/generic_metadata/herds.py |
| 17 |
index ee1475f..1fe30cb 100644 |
| 18 |
--- a/gpackages/libs/package_info/generic_metadata/herds.py |
| 19 |
+++ b/gpackages/libs/package_info/generic_metadata/herds.py |
| 20 |
@@ -57,10 +57,12 @@ class Herd(AbstractXmlObject, ToStrMixin): |
| 21 |
self._xml_object = xml_object |
| 22 |
|
| 23 |
def __eq__(self, other): |
| 24 |
+ if not isinstance(other, Herd): |
| 25 |
+ return False |
| 26 |
return self.name == other.name |
| 27 |
|
| 28 |
def __ne__(self, other): |
| 29 |
- return self.name != other.name |
| 30 |
+ return not self.__eq__(other) |
| 31 |
|
| 32 |
def __hash__(self): |
| 33 |
return hash(self.name) |
| 34 |
|
| 35 |
diff --git a/gpackages/libs/package_info/generic_metadata/repo_info.py b/gpackages/libs/package_info/generic_metadata/repo_info.py |
| 36 |
index 9bcb22d..1af8e14 100644 |
| 37 |
--- a/gpackages/libs/package_info/generic_metadata/repo_info.py |
| 38 |
+++ b/gpackages/libs/package_info/generic_metadata/repo_info.py |
| 39 |
@@ -66,9 +66,13 @@ class SourcesObject(ToStrMixin): |
| 40 |
return hash(self.source_url) |
| 41 |
|
| 42 |
def __eq__(self, other): |
| 43 |
+ if not isinstance(other, SourcesObject): |
| 44 |
+ return False |
| 45 |
return self.source_url == other.source_url |
| 46 |
|
| 47 |
def __lt__(self, other): |
| 48 |
+ if not isinstance(other, SourcesObject): |
| 49 |
+ return NotImplemented |
| 50 |
return self.source_url < other.source_url |
| 51 |
|
| 52 |
@property |
| 53 |
|
| 54 |
diff --git a/gpackages/libs/package_info/generic_objects.py b/gpackages/libs/package_info/generic_objects.py |
| 55 |
index b80cef6..8c8e2aa 100644 |
| 56 |
--- a/gpackages/libs/package_info/generic_objects.py |
| 57 |
+++ b/gpackages/libs/package_info/generic_objects.py |
| 58 |
@@ -21,10 +21,12 @@ class Use(ToStrMixin, AbstractUse): |
| 59 |
return self.name |
| 60 |
|
| 61 |
def __eq__(self, other): |
| 62 |
+ if not isinstance(other, self): |
| 63 |
+ return False |
| 64 |
return self.name == other.name |
| 65 |
|
| 66 |
def __ne__(self, other): |
| 67 |
- return self.name != other.name |
| 68 |
+ return not self.__eq__(other) |
| 69 |
|
| 70 |
def __hash__(self): |
| 71 |
return hash(self.name) |
| 72 |
@@ -69,9 +71,13 @@ class Keyword(ToStrMixin, AbstractKeywords): |
| 73 |
return self.status > other.status |
| 74 |
|
| 75 |
def __eq__(self, other): |
| 76 |
+ if not isinstance(other, Keyword): |
| 77 |
+ return False |
| 78 |
return (self.arch, self.status) == (other.arch, other.status) |
| 79 |
|
| 80 |
def __lt__(self, other): |
| 81 |
+ if not isinstance(other, Keyword): |
| 82 |
+ return NotImplemented |
| 83 |
return (self.status, self.arch) > (other.status, other.arch) |
| 84 |
|
| 85 |
@property |
Archives