Skip to content

Fix __ge__ and __gt__ comparison methods #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix __ge__ and __gt__ comparison methods #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions lib/orderedset/_orderedset.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,13 +499,15 @@ class OrderedSet(_OrderedSet, MutableSet):
return NotImplemented

def __ge__(self, other):
ret = self < other
if ret is NotImplemented:
return ret
return not ret
if isinstance(other, Set):
return len(self) >= len(other) and set(self) >= set(other)
elif isinstance(other, list):
return len(self) >= len(other) and list(self) >= list(other)
return NotImplemented

def __gt__(self, other):
ret = self <= other
if ret is NotImplemented:
return ret
return not ret
if isinstance(other, Set):
return len(self) > len(other) and set(self) > set(other)
elif isinstance(other, list):
return len(self) > len(other) and list(self) > list(other)
return NotImplemented
15 changes: 15 additions & 0 deletions tests/test_orderedset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,21 @@ def test_ordering(self):
self.assertGreater(oset1, set(oset3))
self.assertGreater(oset1, list(oset3))

oset4 = OrderedSet(self.lst[1:])

self.assertFalse(oset3 < oset4)
self.assertFalse(oset3 < set(oset4))
self.assertFalse(oset3 < list(oset4))
self.assertFalse(oset3 >= oset4)
self.assertFalse(oset3 >= set(oset4))
self.assertFalse(oset3 >= list(oset4))
self.assertFalse(oset3 < oset4)
self.assertFalse(oset3 < set(oset4))
self.assertFalse(oset3 < list(oset4))
self.assertFalse(oset3 >= oset4)
self.assertFalse(oset3 >= set(oset4))
self.assertFalse(oset3 >= list(oset4))


if __name__ == '__main__':
unittest.main()