-

cool-RR · cool-RR · commit 291952c90bd1 · 2014-10-11T00:26:07.000+03:00
diff --git a/source_py3/python_toolbox/nifty_collections/bagging.py b/source_py3/python_toolbox/nifty_collections/bagging.py
@@ -338,53 +338,40 @@ def __lt__(self, other):
         if not isinstance(other, _BaseBagMixin):
             return NotImplemented
         found_strict_difference = False # Until challenged.
-        for element, count in self.items():
-            try:
-                other_count = other[element]
-            except KeyError:
-                return False
-            if not (count <= other_count):
+        all_elements = set(other) | set(self)
+        for element in all_elements:
+            if self[element] > other[element]:
                 return False
-            elif count < other_count:
+            elif self[element] < other[element]:
                 found_strict_difference = True
         return found_strict_difference
     
     def __le__(self, other):
         if not isinstance(other, _BaseBagMixin):
             return NotImplemented
         for element, count in self.items():
-            try:
-                other_count = other[element]
-            except KeyError:
-                return False
-            if not (count <= other_count):
+            if count > other[element]:
                 return False
         return True
     
     def __gt__(self, other):
         if not isinstance(other, _BaseBagMixin):
             return NotImplemented
         found_strict_difference = False # Until challenged.
-        for element, count in self.items():
-            try:
-                other_count = other[element]
-            except KeyError:
-                continue
-            if not (count >= other_count):
+        all_elements = set(other) | set(self)
+        for element in all_elements:
+            if self[element] < other[element]:
                 return False
-            elif count > other_count:
+            elif self[element] > other[element]:
                 found_strict_difference = True
         return found_strict_difference
     
     def __ge__(self, other):
         if not isinstance(other, _BaseBagMixin):
             return NotImplemented
-        for element, count in self.items():
-            try:
-                other_count = other[element]
-            except KeyError:
-                continue
-            if not (count >= other_count):
+        all_elements = set(other) | set(self)
+        for element in all_elements:
+            if self[element] < other[element]:
                 return False
         return True
             
diff --git a/source_py3/test_python_toolbox/test_nifty_collections/test_bagging.py b/source_py3/test_python_toolbox/test_nifty_collections/test_bagging.py
@@ -128,6 +128,10 @@ def test_repr(self):
         assert eval(repr(bag)) == bag
         assert re.match(self._repr_result_pattern, repr(bag))
         
+        empty_bag = self.bag_type()
+        assert eval(repr(empty_bag)) == empty_bag
+        assert repr(empty_bag) == '%s()' % self.bag_type.__name__
+        
 
     def test_no_subtract(self):
         # It's a silly method, yo.
@@ -159,6 +163,11 @@ def test_comparison(self):
                 assert item >= smaller_item
                 assert item > smaller_item
                 assert item != smaller_item
+                assert smaller_item <= item
+                assert smaller_item < item
+                assert not smaller_item >= item
+                assert not smaller_item > item
+                assert smaller_item != item
             not_smaller_items = [item for item in next(zip(*hierarchy)) if
                                                      item not in smaller_items]
             for not_smaller_item in not_smaller_items:
