Correct implemenation for sorting everything

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py
index 531690dc6f1840d0938550d8bd453166bd7d314f..e2906fd36c4b2721e35fd36c018879f2339bfbe0 100644 (file)
--- a/src/buildservice/builds.py
+++ b/src/buildservice/builds.py
@@ -345,14 +345,12 @@ class Build(base.DataObject):
        def __repr__(self):
                return "<%s id=%s %s>" % (self.__class__.__name__, self.id, self.pkg)
 
-       def __eq__(self, other):
-               if isinstance(other, self.__class__):
-                       return self.id == other.id
-
        def __lt__(self, other):
                if isinstance(other, self.__class__):
                        return self.pkg < other.pkg
 
+               return NotImplemented
+
        def __iter__(self):
                jobs = self.backend.jobs._get_jobs("SELECT * FROM jobs \
                        WHERE build_id = %s", self.id)

diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py
index 6b8cb813c65efc0ce6b3605309f0970a05e6d978..6f254ece7612307937ebedab79a59b05ff9946d9 100644 (file)
--- a/src/buildservice/jobs.py
+++ b/src/buildservice/jobs.py
@@ -96,12 +96,6 @@ class Job(base.DataObject):
        def __str__(self):
                return self.name
 
-       def __eq__(self, other):
-               if isinstance(other, self.__class__):
-                       return self.id == other.id
-
-               return NotImplemented
-
        def __lt__(self, other):
                if isinstance(other, self.__class__):
                        if not self.test and other.test:

diff --git a/src/buildservice/mirrors.py b/src/buildservice/mirrors.py
index 45c8ea7ba1770616650a527e13ee2171dc0929ee..40579aab4296b55777014747a87423b00f17fb2f 100644 (file)
--- a/src/buildservice/mirrors.py
+++ b/src/buildservice/mirrors.py
@@ -125,9 +125,11 @@ class Mirrors(base.Object):
 class Mirror(base.DataObject):
        table = "mirrors"
 
-       def __eq__(self, other):
+       def __lt__(self, other):
                if isinstance(other, self.__class__):
-                       return self.id == other.id
+                       return self.hostname < other.hostname
+
+               return NotImplemented
 
        def log(self, action, user=None):
                user_id = None

diff --git a/src/buildservice/packages.py b/src/buildservice/packages.py
index ff287852a738cca18f23dce78c8b528108797b28..7c5c5b5e8b3ff13a7818b08bd3b720d9b85694fc 100644 (file)
--- a/src/buildservice/packages.py
+++ b/src/buildservice/packages.py
@@ -167,14 +167,12 @@ class Package(base.DataObject):
        def __str__(self):
                return self.friendly_name
 
-       def __eq__(self, other):
-               if isinstance(other, self.__class__):
-                       return self.id == other.id
-
        def __lt__(self, other):
                if isinstance(other, self.__class__):
                        return pakfire.util.version_compare(self.backend, self.friendly_name, other.friendly_name) < 0
 
+               return NotImplemented
+
        def delete(self):
                self.backend.delete_file(os.path.join(PACKAGES_DIR, self.path))
 

diff --git a/src/buildservice/repository.py b/src/buildservice/repository.py
index 858d750b4a01eb1013507ccd6de88df0c0d4309b..868e61373958bd6cf6a52b545b7217d1f4c0a4b4 100644 (file)
--- a/src/buildservice/repository.py
+++ b/src/buildservice/repository.py
@@ -87,14 +87,12 @@ class Repositories(base.Object):
 class Repository(base.DataObject):
        table = "repositories"
 
-       def __eq__(self, other):
-               if isinstance(other, self.__class__):
-                       return self.id == other.id
-
        def __lt__(self, other):
                if isinstance(other, self.__class__):
                        return self.parent_id == other.id
 
+               return NotImplemented
+
        def __iter__(self):
                builds = self.backend.builds._get_builds("SELECT builds.* FROM repositories_builds \
                        LEFT JOIN builds ON repositories_builds.build_id = builds.id \

diff --git a/src/buildservice/sessions.py b/src/buildservice/sessions.py
index 46f17d1635149ae7a49297febe450de805eb3bc6..0b87ae69f62af72f5172da18e9018cbd69fecd5b 100644 (file)
--- a/src/buildservice/sessions.py
+++ b/src/buildservice/sessions.py
@@ -51,14 +51,12 @@ class Sessions(base.Object):
 class Session(base.DataObject):
        table = "sessions"
 
-       def __eq__(self, other):
-               if isinstance(other, self.__class__):
-                       return self.id == other.id
-
        def __lt__(self, other):
                if isinstance(other, self.__class__):
                        return self.user < other.user
 
+               return NotImplemented
+
        def destroy(self):
                self.db.execute("DELETE FROM sessions WHERE id = %s", self.id)
 

diff --git a/src/buildservice/sources.py b/src/buildservice/sources.py
index 2dacb8abf76ab6f10e068481876bb2d6433453a0..b827dc1620adc263fcfce8a79f4d402d480d47c0 100644 (file)
--- a/src/buildservice/sources.py
+++ b/src/buildservice/sources.py
@@ -338,9 +338,6 @@ class Commit(base.DataObject):
 class Source(base.DataObject):
        table = "sources"
 
-       def __eq__(self, other):
-               return self.id == other.id
-
        def __len__(self):
                ret = self.db.get("SELECT COUNT(*) AS len FROM sources_commits \
                        WHERE source_id = %s", self.id)

diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 2bcb495e8c2aee7adad833dbba49e00fd7ba670d..63a603d0b35e40f1f1ba002dc912f1548ce73096 100644 (file)
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -186,12 +186,6 @@ class User(base.DataObject):
        def __hash__(self):
                return hash(self.id)
 
-       def __eq__(self, other):
-               if isinstance(other, self.__class__):
-                       return self.id == other.id
-
-               return NotImplemented
-
        def __lt__(self, other):
                if isinstance(other, self.__class__):
                        return self.name < other.name