fixes a corner case of tuple with len 1 encoding

Author: oesteban

nipype/interfaces/base.py

@@ -47,6 +47,7 @@
 nipype_version = LooseVersion(__version__)
 iflogger = logging.getLogger('interface')
 
+FLOAT_FORMAT = '{:.10f}'.format
 PY35 = sys.version_info >= (3, 5)
 PY3 = sys.version_info[0] > 2
 
@@ -619,7 +620,7 @@ def _get_sorteddict(self, theobject, dictwithhash=False, hash_method=None,
                     else:
                         out = hash
                 elif isinstance(theobject, float):
-                    out = '%.10f' % theobject
+                    out = FLOAT_FORMAT(theobject)
                 else:
                     out = theobject
         return out

nipype/interfaces/tests/test_base.py

@@ -511,8 +511,8 @@ def __init__(self, **inputs):
     tsthash2 = Registration(from_file=settings)
     yield assert_equal, {}, check_dict(data_dict, tsthash2.inputs.get_traitsfree())
 
-    hashed_inputs, hashvalue = tsthash.inputs.get_hashval(hash_method='timestamp')
-    yield assert_equal, hashvalue, '9ab944cbccba61475becb9eac65052af'
+    _, hashvalue = tsthash.inputs.get_hashval(hash_method='timestamp')
+    yield assert_equal, 'ec5755e07287e04a4b409e03b77a517c', hashvalue
 
 def test_input_version():
     class InputSpec(nib.TraitedSpec):

nipype/utils/filemanip.py

@@ -89,22 +89,38 @@ def encode_dict(value):
 
     """
     if sys.version_info[0] > 2:
-        return str(value)
+        retval = str(value)
+    else:
+        retval = encode_dict_py27(value)
+    return retval
 
-    if isinstance(value, str):
-        value = value.encode()
+def encode_dict_py27(value):
+    """
+    Encode dictionary for python 2
+    """
 
     istuple = isinstance(value, tuple)
-    if isinstance(value, list) or istuple:
+    if isinstance(value, (tuple, list)):
         retval = '(' if istuple else '['
+        nels = len(value)
         for i, v in enumerate(value):
-            if i > 0:
+            venc = encode_dict_py27(v)
+            if venc.startswith("u'") or venc.startswith('u"'):
+                venc = venc[1:]
+            retval += venc
+
+            if i < nels - 1:
                 retval += ', '
-            retval += encode_dict(v)
+
+        if istuple and nels == 1:
+            retval += ','
         retval += ')' if istuple else ']'
         return retval
 
-    return repr(value)
+    retval = repr(value).decode()
+    if retval.startswith("u'") or retval.startswith('u"'):
+        retval = retval[1:]
+    return retval
 
 def fname_presuffix(fname, prefix='', suffix='', newpath=None, use_ext=True):
     """Manipulates path and name of input filename