Attempt to refactor a bit of context, new count transform that counts the calls, new bonobo.structs package with basic data structures, removal of blessings.

tests/core/test_contexts.py

@@ -1,6 +1,6 @@
 from bonobo import Graph, NaiveStrategy, Bag, contextual
+from bonobo.constants import BEGIN, END
 from bonobo.context.execution import GraphExecutionContext
-from bonobo.util.tokens import BEGIN, END
 
 
 def generate_integers():

tests/core/test_inputs.py

@@ -18,9 +18,9 @@ from queue import Empty
 
 import pytest
 
-from bonobo.core.errors import InactiveWritableError, InactiveReadableError
+from bonobo.constants import BEGIN, END
 from bonobo.core.inputs import Input
-from bonobo.util.tokens import BEGIN, END
+from bonobo.errors import InactiveWritableError, InactiveReadableError
 
 
 def test_input_runlevels():

tests/io/test_csv.py

@@ -1,9 +1,9 @@
 import pytest
 
 from bonobo import Bag, CsvReader, CsvWriter
+from bonobo.constants import BEGIN, END
 from bonobo.context.execution import NodeExecutionContext
 from bonobo.util.testing import CapturingNodeExecutionContext
-from bonobo.util.tokens import BEGIN, END
 
 
 def test_write_csv_to_file(tmpdir):

tests/io/test_file.py

@@ -3,7 +3,7 @@ import pytest
 from bonobo import FileWriter, Bag, FileReader
 from bonobo.context.execution import NodeExecutionContext
 from bonobo.util.testing import CapturingNodeExecutionContext
-from bonobo.util.tokens import BEGIN, END
+from bonobo.constants import BEGIN, END
 
 
 @pytest.mark.parametrize(

tests/io/test_json.py

@@ -1,10 +1,9 @@
 import pytest
 
 from bonobo import Bag, JsonWriter, JsonReader
+from bonobo.constants import BEGIN, END
 from bonobo.context.execution import NodeExecutionContext
-from bonobo.util.objects import ValueHolder
 from bonobo.util.testing import CapturingNodeExecutionContext
-from bonobo.util.tokens import BEGIN, END
 
 
 def test_write_json_to_file(tmpdir):

tests/structs/test_bags.py

@@ -1,9 +1,9 @@
 from mock import Mock
 
 from bonobo import Bag
-from bonobo.core.bags import INHERIT_INPUT
+from bonobo.constants import INHERIT_INPUT
 
-args = ('foo', 'bar', )
+args = ('foo', 'bar',)
 kwargs = dict(acme='corp')
 
 
@@ -32,29 +32,29 @@ def test_inherit():
     bag3 = bag.extend('c', c=3)
     bag4 = Bag('d', d=4)
 
-    assert bag.args == ('a', )
+    assert bag.args == ('a',)
     assert bag.kwargs == {'a': 1}
     assert bag.flags is ()
 
-    assert bag2.args == ('a', 'b', )
+    assert bag2.args == ('a', 'b',)
     assert bag2.kwargs == {'a': 1, 'b': 2}
     assert INHERIT_INPUT in bag2.flags
 
-    assert bag3.args == ('a', 'c', )
+    assert bag3.args == ('a', 'c',)
     assert bag3.kwargs == {'a': 1, 'c': 3}
     assert bag3.flags is ()
 
-    assert bag4.args == ('d', )
+    assert bag4.args == ('d',)
     assert bag4.kwargs == {'d': 4}
     assert bag4.flags is ()
 
     bag4.set_parent(bag)
-    assert bag4.args == ('a', 'd', )
+    assert bag4.args == ('a', 'd',)
     assert bag4.kwargs == {'a': 1, 'd': 4}
     assert bag4.flags is ()
 
     bag4.set_parent(bag3)
-    assert bag4.args == ('a', 'c', 'd', )
+    assert bag4.args == ('a', 'c', 'd',)
     assert bag4.kwargs == {'a': 1, 'c': 3, 'd': 4}
     assert bag4.flags is ()
 

tests/structs/test_graphs.py

@@ -1,7 +1,6 @@
 import pytest
 
-from bonobo.core.graphs import Graph
-from bonobo.util.tokens import BEGIN
+from bonobo import Graph, BEGIN
 
 identity = lambda x: x
 

tests/structs/test_tokens.py

@@ -1,4 +1,4 @@
-from bonobo.util.tokens import Token
+from bonobo import Token
 
 
 def test_token_repr():