Change Graph.__getitem__ to shorthand for get_cursor

bonobo/structs/graphs.py

@@ -102,8 +102,8 @@ def __len__(self):
         """
         return len(self.nodes)
 
-    def __getitem__(self, key):
-        return self.nodes[key]
+    def __getitem__(self, ref):
+        return self.get_cursor(ref)
 
     def __enter__(self):
         return self.get_cursor().__enter__()
@@ -313,7 +313,7 @@ def graphviz(self):
             for i in self.outputs_of(BEGIN):
                 g.edge("BEGIN", str(i))
             for ix in self.topologically_sorted_indexes:
-                g.node(str(ix), label=get_name(self[ix]))
+                g.node(str(ix), label=get_name(self.nodes[ix]))
                 for iy in self.outputs_of(ix):
                     g.edge(str(ix), str(iy))
             self._graphviz = g
@@ -331,5 +331,5 @@ def _repr_html_(self):
 
 def _get_graphviz_node_id(graph, i):
     escaped_index = str(i)
-    escaped_name = json.dumps(get_name(graph[i]))
+    escaped_name = json.dumps(get_name(graph.nodes[i]))
     return "{{{} [label={}]}}".format(escaped_index, escaped_name)

tests/structs/test_graphs.py

@@ -90,16 +90,16 @@ def test_graph_topological_sort():
     g.add_chain(a1, a2, a3, _input=None, _output=None)
 
     assert g.topologically_sorted_indexes == (0, 1, 2)
-    assert g[0] == a1
-    assert g[1] == a2
-    assert g[2] == a3
+    assert g.nodes[0] == a1
+    assert g.nodes[1] == a2
+    assert g.nodes[2] == a3
 
     g.add_chain(b1, b2, _output=a2)
 
     assert g.topologically_sorted_indexes[-2:] == (1, 2)
     assert g.topologically_sorted_indexes.index(3) < g.topologically_sorted_indexes.index(4)
-    assert g[3] == b1
-    assert g[4] == b2
+    assert g.nodes[3] == b1
+    assert g.nodes[4] == b2
 
 
 def test_connect_two_chains():

tests/structs/test_graphs_new_syntax.py

@@ -18,7 +18,7 @@ def test_get_cursor():
 
 def test_get_cursor_in_a_vacuum():
     g = Graph()
-    cursor = g.get_cursor(None)
+    cursor = g[None]
 
     assert cursor.graph is g
     assert cursor.first is None
@@ -71,7 +71,7 @@ def test_cursor_to_fork_a_graph():
 
     g = Graph()
     g >> a >> b >> c
-    g.get_cursor(b) >> d >> e
+    g[b] >> d >> e
 
     assert len(g) == 5
     assert g.outputs_of(BEGIN) == {g.index_of(a)}