-

cool-RR · cool-RR · commit 410a760d1fb0 · 2014-10-26T21:16:21.000+02:00
diff --git a/source_py2/python_toolbox/nifty_collections/bagging.py b/source_py2/python_toolbox/nifty_collections/bagging.py
@@ -47,12 +47,12 @@ def _process_count(count):
     if not math_tools.is_integer(count):
         raise TypeError(
             'You passed %s as a count, while a `Bag` can only handle integer '
-            'counts.' % count
+            'counts.' % repr(count)
         )
     if count < 0:
         raise TypeError(
             "You passed %s as a count, while `Bag` doesn't support negative "
-            "amounts." % count
+            "amounts." % repr(count)
         )
     
     if count == 0:
@@ -539,9 +539,6 @@ def get_contained_bags(self):
     
 
     
-        
-        
-
 class _MutableBagMixin(_BaseBagMixin):
     '''Mixin for a bag that's mutable. (i.e. not frozen.)'''
     
diff --git a/source_py2/test_python_toolbox/test_nifty_collections/test_bagging.py b/source_py2/test_python_toolbox/test_nifty_collections/test_bagging.py
@@ -366,30 +366,30 @@ def test_operations(self):
         
         
         
-        def test_get_contained_bags(self):
-            bag = self.bag_type('abracadabra')
-            contained_bags = bag.get_contained_bags()
-            assert len(contained_bags) == 2 ** len('abracadabra')
-            had_full_one = False
-            for contained_bag in contained_bags:
-                assert contained_bag <= bag
-                if contained_bag == bag:
-                    assert had_full_one is False
-                    had_full_one = True
-                else:
-                    assert contained_bag < bag
-                if isinstance(bag, nifty_collections.Ordered):
-                    assert cute_iter_tools.is_sorted(
-                        tuple(contained_bag.items()),
-                        key=tuple(bag.items()).index
-                    )
-                
-            contained_bags_tuple = tuple(contained_bags)
-            assert self.bag_type('arcaba') in contained_bags_tuple
-            assert self.bag_type('db') in contained_bags_tuple
-            assert self.bag_type() in contained_bags_tuple
-            assert self.bag_type('x') not in contained_bags_tuple
+    def test_get_contained_bags(self):
+        bag = self.bag_type('abracadabra')
+        contained_bags = bag.get_contained_bags()
+        assert len(contained_bags) == 6 * 3 * 2 * 2 * 3
+        had_full_one = False
+        for contained_bag in contained_bags:
+            assert contained_bag <= bag
+            if contained_bag == bag:
+                assert had_full_one is False
+                had_full_one = True
+            else:
+                assert contained_bag < bag
+            if isinstance(bag, nifty_collections.Ordered):
+                assert cute_iter_tools.is_sorted(
+                    tuple(contained_bag.keys()),
+                    key=tuple(bag.keys()).index
+                )
             
+        contained_bags_tuple = tuple(contained_bags)
+        assert self.bag_type('abraca') in contained_bags_tuple
+        assert self.bag_type('bd') in contained_bags_tuple
+        assert self.bag_type() in contained_bags_tuple
+        assert self.bag_type('x') not in contained_bags_tuple
+        
         
         
 class BaseMutableBagTestCase(BaseBagTestCase):
@@ -552,8 +552,8 @@ def test_mutating(self):
         assert bag == self.bag_type('brcdbr')
 
         bag = bag_reference = self.bag_type('abracadabra')
-        bag.update(bag)
-        assert bag == self.bag_type('abracadabra')
+        bag.update(self.bag_type('axy'))
+        assert bag == self.bag_type('abrcdbrxy')
         assert bag is bag_reference
             
     def test_clear(self):
