feat, wip: refactoring and simplification of how casts are made.

tests/execution/contexts/test_execution_contexts_node.py

@@ -3,9 +3,10 @@ from unittest.mock import MagicMock
 import pytest
 
 from bonobo import Graph
-from bonobo.constants import EMPTY, NOT_MODIFIED, INHERIT
+from bonobo.constants import EMPTY
 from bonobo.execution.contexts.node import NodeExecutionContext, split_token
 from bonobo.execution.strategies import NaiveStrategy
+from bonobo.util.envelopes import F_NOT_MODIFIED, F_INHERIT
 from bonobo.util.testing import BufferingNodeExecutionContext, BufferingGraphExecutionContext
 
 
@@ -227,32 +228,36 @@ def test_node_lifecycle_with_kill():
 
 
 def test_split_token():
-    assert split_token(('foo', 'bar')) == (set(), ('foo', 'bar'))
-    assert split_token(()) == (set(), ())
-    assert split_token('') == (set(), ('', ))
+    with pytest.deprecated_call():
+        assert split_token(('foo', 'bar')) == (set(), ('foo', 'bar'))
+        assert split_token(()) == (set(), ())
+        assert split_token('') == (set(), ('', ))
 
 
 def test_split_token_duplicate():
-    with pytest.raises(ValueError):
-        split_token((NOT_MODIFIED, NOT_MODIFIED))
-    with pytest.raises(ValueError):
-        split_token((INHERIT, INHERIT))
-    with pytest.raises(ValueError):
-        split_token((INHERIT, NOT_MODIFIED, INHERIT))
+    with pytest.deprecated_call():
+        with pytest.raises(ValueError):
+            split_token((F_NOT_MODIFIED, F_NOT_MODIFIED))
+        with pytest.raises(ValueError):
+            split_token((F_INHERIT, F_INHERIT))
+        with pytest.raises(ValueError):
+            split_token((F_INHERIT, F_NOT_MODIFIED, F_INHERIT))
 
 
 def test_split_token_not_modified():
-    with pytest.raises(ValueError):
-        split_token((NOT_MODIFIED, 'foo', 'bar'))
-    with pytest.raises(ValueError):
-        split_token((NOT_MODIFIED, INHERIT))
-    with pytest.raises(ValueError):
-        split_token((INHERIT, NOT_MODIFIED))
-    assert split_token(NOT_MODIFIED) == ({NOT_MODIFIED}, ())
-    assert split_token((NOT_MODIFIED, )) == ({NOT_MODIFIED}, ())
+    with pytest.deprecated_call():
+        with pytest.raises(ValueError):
+            split_token((F_NOT_MODIFIED, 'foo', 'bar'))
+        with pytest.raises(ValueError):
+            split_token((F_NOT_MODIFIED, F_INHERIT))
+        with pytest.raises(ValueError):
+            split_token((F_INHERIT, F_NOT_MODIFIED))
+        assert split_token(F_NOT_MODIFIED) == ({F_NOT_MODIFIED}, ())
+        assert split_token((F_NOT_MODIFIED, )) == ({F_NOT_MODIFIED}, ())
 
 
 def test_split_token_inherit():
-    assert split_token(INHERIT) == ({INHERIT}, ())
-    assert split_token((INHERIT, )) == ({INHERIT}, ())
-    assert split_token((INHERIT, 'foo', 'bar')) == ({INHERIT}, ('foo', 'bar'))
+    with pytest.deprecated_call():
+        assert split_token(F_INHERIT) == ({F_INHERIT}, ())
+        assert split_token((F_INHERIT, )) == ({F_INHERIT}, ())
+        assert split_token((F_INHERIT, 'foo', 'bar')) == ({F_INHERIT}, ('foo', 'bar'))