-

cool-RR · cool-RR · commit e5473a4a1c35 · 2014-10-18T19:41:42.000+03:00
diff --git a/source_py3/python_toolbox/nifty_collections/bagging.py b/source_py3/python_toolbox/nifty_collections/bagging.py
@@ -719,8 +719,11 @@ def popitem(self):
         Pop an item from this bag, returning `(key, count)` and removing it.
         '''
         return self._dict.popitem()
-      
-
+    
+    def get_frozen(self):
+        '''Get a frozen version of this bag.'''
+        return self._frozen_type(self)
+     
 
 class _OrderedBagMixin(Ordered):
     '''
@@ -785,6 +788,9 @@ def frozen_bag_bag(self):
         from .frozen_bag_bag import FrozenBagBag
         return FrozenBagBag(self.values())
         
+    def get_mutable(self):
+        '''Get a mutable version of this bag.'''
+        return self._mutable_type(self)
     
 
 class _BaseDictDelegator(collections.MutableMapping):
@@ -890,7 +896,9 @@ class Bag(_MutableBagMixin, _DictDelegator):
     objects. This means we do not allow arbitrary values for counts like
     `collections.Counter` and we don't have to deal with all the complications
     that follow. Only positive integers are allowed as counts.
-    '''                
+    '''
+    
+    
     
                 
 class OrderedBag(_OrderedBagMixin, _MutableBagMixin, _OrderedDictDelegator):
@@ -935,7 +943,7 @@ def popitem(self, last=True):
         '._dict.sort',
         doc='Sort the keys in this bag. (With optional `key` function.)'
     )
-      
+    
     
                 
 class FrozenBag(_BaseBagMixin, _FrozenBagMixin, FrozenDict):
@@ -1000,4 +1008,9 @@ class FrozenOrderedBag(_OrderedBagMixin, _FrozenBagMixin, _BaseBagMixin,
     '''
     def __hash__(self):
         return hash((type(self), tuple(self.items())))
-        
+        
+        
+Bag._frozen_type = FrozenBag
+OrderedBag._frozen_type = FrozenOrderedBag
+FrozenBag._mutable_type = Bag
+FrozenOrderedBag._mutable_type = OrderedBag
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
@@ -367,6 +367,24 @@ def test_operations(self):
         
         
 class BaseMutableBagTestCase(BaseBagTestCase):
+    
+    def test_get_mutable(self):
+        bag = self.bag_type('abracadabra')
+        assert not hasattr(bag, 'get_mutable')
+        with cute_testing.RaiseAssertor(AttributeError):
+            bag.get_mutable()
+            
+    def test_get_frozen(self):
+        bag = self.bag_type('abracadabra')
+        frozen_bag = bag.get_frozen()
+        assert isinstance(frozen_bag, collections.Hashable)
+        if isinstance(bag, nifty_collections.Ordered):
+            assert tuple(bag.items()) == tuple(frozen_bag.items())
+        else:
+            assert set(bag.items()) == set(frozen_bag.items())
+        assert type(frozen_bag).__name__ == 'Frozen%s' % type(bag).__name__
+        assert frozen_bag.get_mutable() == bag
+    
     def test_hash(self):
         bag = self.bag_type('abracadabra')
         assert not isinstance(bag, collections.Hashable)
@@ -522,6 +540,25 @@ def test_clear(self):
     
 class BaseFrozenBagTestCase(BaseBagTestCase):
     
+    def test_get_mutable(self):
+        bag = self.bag_type('abracadabra')
+        mutable_bag = bag.get_mutable()
+        assert not isinstance(mutable_bag, collections.Hashable)
+        if isinstance(bag, nifty_collections.Ordered):
+            assert tuple(bag.items()) == tuple(mutable_bag.items())
+        else:
+            assert set(bag.items()) == set(mutable_bag.items())
+        assert type(bag).__name__ == 'Frozen%s' % type(mutable_bag).__name__
+        assert mutable_bag.get_frozen() == bag
+
+            
+    def test_get_frozen(self):
+        bag = self.bag_type('abracadabra')
+        assert not hasattr(bag, 'get_frozen')
+        with cute_testing.RaiseAssertor(AttributeError):
+            bag.get_frozen()
+
+    
     def test_hash(self):
         bag = self.bag_type('abracadabra')
         assert isinstance(bag, collections.Hashable)
