small cleaning, Chris review

Author: djarecka

nipype/pipeline/engine/tests/test_engine.py

@@ -9,7 +9,7 @@
 from builtins import open
 from copy import deepcopy
 from glob import glob
-import os, pdb
+import os
 
 
 import pytest
@@ -499,12 +499,6 @@ def test_deep_nested_write_graph_runs(tmpdir):
                          'pipemod1:outoutput1:e -> pipemod2:ininput1:w;\n',
                          '}']
 
-dotfile_flat = dotfile_orig
-dotfile_detailed_flat = dotfile_detailed_orig
-
-dotfile_exec = dotfile_orig
-dotfile_detailed_exec = dotfile_detailed_orig
-
 
 dotfile_hierarchical = ['digraph pipe{\n',
                         '  label="pipe";\n',
@@ -520,6 +514,14 @@ def test_deep_nested_write_graph_runs(tmpdir):
                    '  pipe_mod1 -> pipe_mod2;\n',
                    '}']
 
+dotfiles = {
+    "orig": dotfile_orig,
+    "flat": dotfile_orig,
+    "exec": dotfile_orig,
+    "hierarchical": dotfile_hierarchical,
+    "colored": dotfile_colored
+    }
+
 @pytest.mark.parametrize("simple", [True, False])
 @pytest.mark.parametrize("graph_type", ['orig', 'flat', 'exec', 'hierarchical', 'colored'])
 def test_write_graph_dotfile(tmpdir, graph_type, simple):
@@ -537,35 +539,29 @@ def test_write_graph_dotfile(tmpdir, graph_type, simple):
         graph_str = f.read()
 
     if simple:
-        for str in eval("dotfile_{}".format(graph_type)):
-            assert str in graph_str
+        for line in dotfiles[graph_type]:
+            assert line in graph_str
     else:
         # if simple=False graph.dot uses longer names
-        for str in eval("dotfile_{}".format(graph_type)):
+        for line in dotfiles[graph_type]:
             if graph_type in ["hierarchical", "colored"]:
-                assert str.replace("mod1 (engine)", "mod1.EngineTestInterface.engine").replace(
+                assert line.replace("mod1 (engine)", "mod1.EngineTestInterface.engine").replace(
                     "mod2 (engine)", "mod2.EngineTestInterface.engine") in graph_str
             else:
-                assert str.replace(
+                assert line.replace(
                     "mod1 (engine)", "pipe.mod1.EngineTestInterface.engine").replace(
                     "mod2 (engine)", "pipe.mod2.EngineTestInterface.engine") in graph_str
 
+    # graph_detailed is the same for orig, flat, exec (if no iterables)
     # graph_detailed is not created for hierachical or colored
     if graph_type not in ["hierarchical", "colored"]:
         with open("graph_detailed.dot") as f:
             graph_str = f.read()
-        for str in eval("dotfile_detailed_{}".format(graph_type)):
-            assert str in graph_str
+        for line in dotfile_detailed_orig:
+            assert line in graph_str
 
 
 # examples of dot files used in the following test
-dotfile_iter_orig = dotfile_orig
-dotfile_detailed_iter_orig = dotfile_detailed_orig
-
-dotfile_iter_flat = dotfile_orig
-dotfile_detailed_iter_flat = dotfile_detailed_orig
-
-dotfile_iter_exec = dotfile_orig
 dotfile_detailed_iter_exec = [
     'digraph structs {\n',
     'node [shape=record];\n',
@@ -593,6 +589,20 @@ def test_write_graph_dotfile(tmpdir, graph_type, simple):
     '  pipe_mod1 -> pipe_mod2;\n',
     '}']
 
+dotfiles_iter = {
+    "orig": dotfile_orig,
+    "flat": dotfile_orig,
+    "exec": dotfile_orig,
+    "hierarchical": dotfile_iter_hierarchical,
+    "colored": dotfile_iter_colored
+    }
+
+dotfiles_detailed_iter = {
+    "orig": dotfile_detailed_orig,
+    "flat": dotfile_detailed_orig,
+    "exec": dotfile_detailed_iter_exec
+    }
+
 @pytest.mark.parametrize("simple", [True, False])
 @pytest.mark.parametrize("graph_type", ['orig', 'flat', 'exec', 'hierarchical', 'colored'])
 def test_write_graph_dotfile_iterables(tmpdir, graph_type, simple):
@@ -611,25 +621,25 @@ def test_write_graph_dotfile_iterables(tmpdir, graph_type, simple):
         graph_str = f.read()
 
     if simple:
-        for str in eval("dotfile_iter_{}".format(graph_type)):
-            assert str in graph_str
+        for line in dotfiles_iter[graph_type]:
+            assert line in graph_str
     else:
         # if simple=False graph.dot uses longer names
-        for str in eval("dotfile_iter_{}".format(graph_type)):
+        for line in dotfiles_iter[graph_type]:
             if graph_type in ["hierarchical", "colored"]:
-                assert str.replace("mod1 (engine)", "mod1.EngineTestInterface.engine").replace(
+                assert line.replace("mod1 (engine)", "mod1.EngineTestInterface.engine").replace(
                     "mod2 (engine)", "mod2.EngineTestInterface.engine") in graph_str
             else:
-                assert str.replace(
+                assert line.replace(
                     "mod1 (engine)", "pipe.mod1.EngineTestInterface.engine").replace(
                     "mod2 (engine)", "pipe.mod2.EngineTestInterface.engine") in graph_str
 
     # graph_detailed is not created for hierachical or colored
     if graph_type not in ["hierarchical", "colored"]:
         with open("graph_detailed.dot") as f:
             graph_str = f.read()
-        for str in eval("dotfile_detailed_iter_{}".format(graph_type)):
-            assert str in graph_str
+        for line in dotfiles_detailed_iter[graph_type]:
+            assert line in graph_str
 
 
 

nipype/pipeline/engine/utils.py

@@ -507,7 +507,7 @@ def _write_detailed_dot(graph, dotfilename):
     # write nodes
     edges = []
     for n in nx.topological_sort(graph):
-        nodename = str(n.itername)
+        nodename = n.itername
         inports = []
         for u, v, d in graph.in_edges(nbunch=n, data=True):
             for cd in d['connect']: