diff --git a/contrib/graph/graph.py b/contrib/graph/graph.py
index afd1d446b4..e174ff5026 100644
--- a/contrib/graph/graph.py
+++ b/contrib/graph/graph.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
# Copyright 2014-2016 OpenMarket Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -48,7 +49,7 @@ def make_graph(pdus, room, filename_prefix):
c = colors.pop()
color_map[o] = c
except:
- print "Run out of colours!"
+ print("Run out of colours!")
color_map[o] = "black"
graph = pydot.Dot(graph_name="Test")
@@ -93,7 +94,7 @@ def make_graph(pdus, room, filename_prefix):
end_name = make_name(i, o)
if end_name not in node_map:
- print "%s not in nodes" % end_name
+ print("%s not in nodes" % end_name)
continue
edge = pydot.Edge(node_map[start_name], node_map[end_name])
diff --git a/contrib/graph/graph3.py b/contrib/graph/graph3.py
index 7d3b4d7eb6..fe1dc81e90 100644
--- a/contrib/graph/graph3.py
+++ b/contrib/graph/graph3.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
# Copyright 2016 OpenMarket Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,19 +27,19 @@ from six import string_types
def make_graph(file_name, room_id, file_prefix, limit):
- print "Reading lines"
+ print("Reading lines")
with open(file_name) as f:
lines = f.readlines()
- print "Read lines"
+ print("Read lines")
events = [FrozenEvent(json.loads(line)) for line in lines]
- print "Loaded events."
+ print("Loaded events.")
events.sort(key=lambda e: e.depth)
- print "Sorted events"
+ print("Sorted events")
if limit:
events = events[-int(limit):]
@@ -55,7 +56,7 @@ def make_graph(file_name, room_id, file_prefix, limit):
content = json.dumps(unfreeze(event.get_dict()["content"]), indent=4)
content = content.replace("\n", "<br/>\n")
- print content
+ print(content)
content = []
for key, value in unfreeze(event.get_dict()["content"]).items():
if value is None:
@@ -74,7 +75,7 @@ def make_graph(file_name, room_id, file_prefix, limit):
content = "<br/>\n".join(content)
- print content
+ print(content)
label = (
"<"
@@ -102,7 +103,7 @@ def make_graph(file_name, room_id, file_prefix, limit):
node_map[event.event_id] = node
graph.add_node(node)
- print "Created Nodes"
+ print("Created Nodes")
for event in events:
for prev_id, _ in event.prev_events:
@@ -120,15 +121,15 @@ def make_graph(file_name, room_id, file_prefix, limit):
edge = pydot.Edge(node_map[event.event_id], end_node)
graph.add_edge(edge)
- print "Created edges"
+ print("Created edges")
graph.write('%s.dot' % file_prefix, format='raw', prog='dot')
- print "Created Dot"
+ print("Created Dot")
graph.write_svg("%s.svg" % file_prefix, prog='dot')
- print "Created svg"
+ print("Created svg")
if __name__ == "__main__":
parser = argparse.ArgumentParser(
|
