-

cool-RR · cool-RR · commit cd5dd250bfd9 · 2015-12-14T22:24:40.000+02:00
diff --git a/source_py3/python_toolbox/freezing/delegatee_context_manager.py b/source_py3/python_toolbox/freezing/delegatee_context_manager.py
@@ -17,12 +17,12 @@ def __init__(self, freezer):
         '''The freezer to which we belong.'''
         
 
-    def reentrant_enter(self):
+    def __enter__(self):
         '''Call the freezer's freeze handler.'''
         return self.freezer.freeze_handler()
     
     
-    def reentrant_exit(self, exc_type, exc_value, exc_traceback):
+    def __exit__(self, exc_type, exc_value, exc_traceback):
         '''Call the freezer's thaw handler.'''
         return self.freezer.thaw_handler()
         
diff --git a/source_py3/test_python_toolbox/test_caching/test_cached_property.py b/source_py3/test_python_toolbox/test_caching/test_cached_property.py
@@ -9,9 +9,11 @@
 from python_toolbox import misc_tools
 
 from python_toolbox.caching import cache, CachedType, CachedProperty
-from python_toolbox.context_management import as_idempotent, ContextManager
+from python_toolbox.context_management import (as_idempotent, as_reentrant,
+                                               BlankContextManager)
 
-get_depth_counting_context_manager = lambda: as_reentrant(ContextManager())
+get_depth_counting_context_manager = \
+                                    lambda: as_reentrant(BlankContextManager())
 
 
 @misc_tools.set_attributes(i=0)
diff --git a/source_py3/test_python_toolbox/test_context_management/test_nested.py b/source_py3/test_python_toolbox/test_context_management/test_nested.py
@@ -6,10 +6,11 @@
 from python_toolbox import freezing
 from python_toolbox import cute_testing
 
-from python_toolbox.context_management import (ContextManager, nested,
+from python_toolbox.context_management import (BlankContextManager, nested,
                                                as_reentrant)
 
-get_depth_counting_context_manager = lambda: as_reentrant(ContextManager())
+get_depth_counting_context_manager = \
+                                    lambda: as_reentrant(BlankContextManager())
 
 
 def test_nested():
