Merge pull request #1764 from wtriplett/fix/py3-encode-before-hash

improve python 3 compatibility when parameterize_dirs is False

Author: satra

Diff for: nipype/pipeline/engine/nodes.py

@@ -391,7 +391,7 @@ def _parameterization_dir(self, param):
             - Otherwise, return the parameterization unchanged.
         """
         if len(param) > 32:
-            return sha1(param).hexdigest()
+            return sha1(param.encode()).hexdigest()
         else:
             return param
 

Diff for: nipype/pipeline/engine/tests/test_engine.py

@@ -22,7 +22,7 @@
 class InputSpec(nib.TraitedSpec):
     input1 = nib.traits.Int(desc='a random int')
     input2 = nib.traits.Int(desc='a random int')
-
+    input_file = nib.traits.File(desc='Random File')
 
 class OutputSpec(nib.TraitedSpec):
     output1 = nib.traits.List(nib.traits.Int, desc='outputs')
@@ -626,6 +626,33 @@ def func1(in1):
     assert not error_raised
 
 
+def test_parameterize_dirs_false(tmpdir):
+    from ....interfaces.utility import IdentityInterface
+    from ....testing import example_data
+
+    input_file = example_data('fsl_motion_outliers_fd.txt')
+
+    n1 = pe.Node(EngineTestInterface(), name='Node1')
+    n1.iterables = ('input_file', (input_file, input_file))
+    n1.interface.inputs.input1 = 1
+
+    n2 = pe.Node(IdentityInterface(fields='in1'), name='Node2')
+
+    wf = pe.Workflow(name='Test')
+    wf.base_dir = str(tmpdir)
+    wf.config['execution']['parameterize_dirs'] = False
+    wf.connect([(n1, n2, [('output1', 'in1')])])
+
+    error_raised = False
+    try:
+        wf.run()
+    except TypeError as typerr:
+        from nipype.pipeline.engine.base import logger
+        logger.info('Exception: %s' % str(typerr))
+        error_raised = True
+    assert not error_raised
+
+
 def test_serial_input(tmpdir):
     wd = str(tmpdir)
     os.chdir(wd)