-

cool-RR · cool-RR · commit 0a17f26d4b41 · 2012-12-25T14:55:21.000+02:00
diff --git a/python_toolbox/temp_value_setters/temp_value_setter.py b/python_toolbox/temp_value_setters/temp_value_setter.py
@@ -96,10 +96,14 @@ def __init__(self, variable, value, assert_no_fiddling=True):
         
         self.value = value
         '''The value to temporarily set to the variable.'''
+        
+        self.active = False
 
         
     def __enter__(self):
         
+        self.active = True
+        
         self.old_value = self.getter()
         '''The old value of the variable, before entering the suite.'''
         
@@ -108,7 +112,7 @@ def __enter__(self):
         # In `__exit__` we'll want to check if anyone changed the value of the
         # variable in the suite, which is unallowed. But we can't compare to
         # `.value`, because sometimes when you set a value to a variable, some
-        # mechanism modifies that value fore various reasons, resulting in a
+        # mechanism modifies that value for various reasons, resulting in a
         # supposedly equivalent, but not identical, value. For example this
         # happens when you set the current working directory on Mac OS.
         #
@@ -119,11 +123,12 @@ def __enter__(self):
         return self
         
         
-    def __exit__(self, *args, **kwargs):
+    def __exit__(self, exc_type, exc_value, exc_traceback):
 
         if self.assert_no_fiddling:
             # Asserting no-one inside the suite changed our variable:
             assert self.getter() == self._value_right_after_setting
         
         self.setter(self.old_value)
-        
+        
+        self.active = False
diff --git a/test_python_toolbox/test_temp_value_setters/test_temp_value_setter.py b/test_python_toolbox/test_temp_value_setters/test_temp_value_setter.py
@@ -25,7 +25,21 @@ def test_simple():
     with TempValueSetter((a, 'x'), 2):
         assert a.x == 2
     assert a.x == 1
+
+    
+def test_active():
+    a = Object()
+    a.x = 1
     
+    assert a.x == 1
+    temp_value_setter = TempValueSetter((a, 'x'), 2)
+    assert not temp_value_setter.active
+    with temp_value_setter:
+        assert a.x == 2
+        assert temp_value_setter.active
+    assert not temp_value_setter.active
+    assert a.x == 1
+
 
 def test_setter_getter():
     '''Test `TempValueSetter` with variable inputted as `(getter, setter)`.'''
