Merge branch 'tests'

[nepi.git] / src / nepi / util / plotter.py

diff --git a/src/nepi/util/plotter.py b/src/nepi/util/plotter.py
index ec57ee9..f480ab3 100644 (file)
--- a/src/nepi/util/plotter.py
+++ b/src/nepi/util/plotter.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,9 +28,9 @@ except ImportError:
 
 try:
     import matplotlib.pyplot as plt
-except ImportError:
-    msg = ("Matplotlib library is not installed, you will not be able "
-        "generate PNG plots.")
+except:
+    msg = ("Matplotlib library is not installed or X11 is not enabled. "
+        "You will not be able generate PNG plots.")
     logger = logging.Logger("Plotter")
     logger.debug(msg)
 
@@ -57,7 +56,7 @@ class ECPlotter(object):
             networkx.draw(graph, pos = pos, node_color="white", 
                     node_size = 500, with_labels=True)
            
-            label = "\n".join(map(lambda v: "%s: %s" % (v[0], v[1]), labels.iteritems()))
+            label = "\n".join(["%s: %s" % (v[0], v[1]) for v in iter(labels.items())])
             plt.annotate(label, xy=(0.05, 0.95), xycoords='axes fraction')
            
             fpath += ".png"
@@ -85,7 +84,7 @@ class ECPlotter(object):
         labels = dict()
         connections = set()
 
-        for guid, rm in ec._resources.iteritems():
+        for guid, rm in ec._resources.items():
             label = rm.get_rtype()
 
             graph.add_node(guid,