X-Git-Url: http://git.tremily.us/?p=hooke.git;a=blobdiff_plain;f=hooke%2Futil%2Fgraph.py;fp=hooke%2Futil%2Fgraph.py;h=cecb04509f1ed58701257c4b057f04a67f819928;hp=69f392b30212b1bc842c95ae3527eb2aff586dc2;hb=60b12a779acf92ec32ef2d0ed9e5766b11705150;hpb=01c8dd10d343718246c48dc2f4c122d59913de4d

diff --git a/hooke/util/graph.py b/hooke/util/graph.py
index 69f392b..cecb045 100644
--- a/hooke/util/graph.py
+++ b/hooke/util/graph.py
@@ -43,20 +43,20 @@ class Node (list):
 
     We can list all of a node's ancestors.
 
-    >>> print [node for node in d.ancestors()]
+    >>> print([node for node in d.ancestors()])
     [b, c, a]
-    >>> print [node for node in d.ancestors(depth_first=True)]
+    >>> print([node for node in d.ancestors(depth_first=True)])
     [b, a, c]
 
     Ancestors works with cycles.
 
     >>> a.append(d)
-    >>> print [node for node in d.ancestors()]
+    >>> print([node for node in d.ancestors()])
     [b, c, a, d]
 
     We can find the cycle path.
 
-    >>> print d.parent_path(d)
+    >>> print(d.parent_path(d))
     [b, a, d]
 
     After a run through :meth:`Graph.set_children`, we can also
@@ -64,12 +64,12 @@ class Node (list):
 
     >>> g = Graph([a, b, c, d])
     >>> g.set_children()
-    >>> print a.children
+    >>> print(a.children)
     [b, c]
 
     And descendents.
 
-    >>> print [node for node in a.descendents(depth_first=True)]
+    >>> print([node for node in a.descendents(depth_first=True)])
     [b, d, a, c]
     """
     def __init__(self, parents=[], data=None):
@@ -327,7 +327,7 @@ class GraphRowGenerator (list):
         p = GraphRowPrinter(tip_to_root=tip_to_root)
         for node in nodes:
             g.insert(node)
-            print p(g[-1])
+            print(p(g[-1]))
 
     For the split/join branch columns, "born" and "dead" are defined
     from the point of view of `GraphRow`.  For root-to-tip ordering
@@ -403,9 +403,9 @@ class Graph (list):
     >>> n.i.extend([n.f, n.g, n.h])
     >>> g = Graph([n.a,n.b,n.c,n.d,n.e,n.f,n.g,n.h,n.i])
     >>> g.topological_sort(tip_to_root=True)
-    >>> print [node for node in g]
+    >>> print([node for node in g])
     [i, h, g, f, e, d, c, b, a]
-    >>> print g.ascii_graph()
+    >>> print(g.ascii_graph())
     r-\-\ a
     | | * b
     | * | c
@@ -415,7 +415,7 @@ class Graph (list):
     | * | g
     * | | h
     t-/-/ i
-    >>> print g.ascii_graph(tip_to_root=True)
+    >>> print(g.ascii_graph(tip_to_root=True))
     t-\-\ i
     | | * h
     | * | g
@@ -436,7 +436,7 @@ class Graph (list):
     >>> n.g.extend([n.e, n.f])
     >>> n.h.extend([n.c, n.g])
     >>> g = Graph([n.a,n.b,n.c,n.d,n.e,n.f,n.g,n.h])
-    >>> print g.ascii_graph(tip_to_root=True)
+    >>> print(g.ascii_graph(tip_to_root=True))
     t-\ h
     | *-\ g
     | | *-\ f
@@ -452,7 +452,7 @@ class Graph (list):
     ...     nx = getattr(n, char)
     ...     n.i.append(nx)
     >>> g = Graph([n.a,n.b,n.c,n.d,n.e,n.f,n.g,n.h,n.i])
-    >>> print g.ascii_graph(tip_to_root=True)
+    >>> print(g.ascii_graph(tip_to_root=True))
     t-\-\-\-\-\-\-\ i
     | | | | | | | r h
     | | | | | | r g
@@ -469,7 +469,7 @@ class Graph (list):
     ...     nx = getattr(n, char)
     ...     nx.append(n.a)
     >>> g = Graph([n.a,n.b,n.c,n.d,n.e,n.f,n.g,n.h,n.i])
-    >>> print g.ascii_graph(tip_to_root=True)
+    >>> print(g.ascii_graph(tip_to_root=True))
     t i
     | t h
     | | t g
@@ -489,7 +489,7 @@ class Graph (list):
     >>> n.h.extend([n.a, n.c, n.d, n.g])
     >>> n.i.extend([n.a, n.b, n.c, n.g])
     >>> g = Graph([n.a,n.b,n.c,n.d,n.e,n.f,n.g,n.h,n.i])
-    >>> print g.ascii_graph(tip_to_root=True)
+    >>> print(g.ascii_graph(tip_to_root=True))
     t-\-\-\ i
     | | | | t-\-\-\ h
     | | | *-|-|-|-<-\ g