Merge pull request #1656 from oesteban/fix/ParameterizedPaths

[FIX] Several fixes related to unicode literals

Author: satra

CHANGES

@@ -1,6 +1,7 @@
 Upcoming release 0.13
 =====================
 
+* FIX: Minor bugfixes related to unicode literals (https://github.com/nipy/nipype/pull/1656)
 * ENH: Add a DVARS calculation interface (https://github.com/nipy/nipype/pull/1606)
 * ENH: New interface to b0calc of FSL-POSSUM (https://github.com/nipy/nipype/pull/1399)
 * ENH: Convenient load/save of interface inputs (https://github.com/nipy/nipype/pull/1591)

nipype/algorithms/modelgen.py

@@ -547,7 +547,7 @@ def _generate_design(self, infolist=None):
                     out = np.array([])
 
                 if out.size > 0:
-                    iflogger.debug('fname=%s, out=%s, nscans=%s', filename, out, repr(sum(nscans[0:i])))
+                    iflogger.debug('fname=%s, out=%s, nscans=%d', filename, out, sum(nscans[0:i]))
                     sumscans = out.astype(int) + sum(nscans[0:i])
 
                     if out.size == 1:

nipype/caching/memory.py

@@ -93,10 +93,9 @@ def __call__(self, **kwargs):
         return out
 
     def __repr__(self):
-        return '%s(%s.%s, base_dir=%s)' % (self.__class__.__name__,
-                                           self.interface.__module__,
-                                           self.interface.__name__,
-                                           self.base_dir)
+        return '{}({}.{}}, base_dir={})'.format(
+            self.__class__.__name__, self.interface.__module__, self.interface.__name__,
+            self.base_dir)
 
 ################################################################################
 # Memory manager: provide some tracking about what is computed when, to
@@ -302,5 +301,4 @@ def _clear_all_but(self, runs, warn=True):
                        job_names, warn=warn)
 
     def __repr__(self):
-        return '%s(base_dir=%s)' % (self.__class__.__name__,
-                                    self.base_dir)
+        return '{}(base_dir={})'.format(self.__class__.__name__, self.base_dir)

nipype/external/due.py

@@ -42,7 +42,7 @@ def nondecorating_decorator(func):
     cite = load = add = _donothing
 
     def __repr__(self):
-        return self.__class__.__name__ + '()'
+        return '{}()'.format(self.__class__.__name__)
 
 
 def _donothing_func(*args, **kwargs):

nipype/interfaces/base.py

@@ -37,7 +37,7 @@
 from ..utils.provenance import write_provenance
 from ..utils.misc import is_container, trim, str2bool
 from ..utils.filemanip import (md5, hash_infile, FileNotFoundError, hash_timestamp,
-                               split_filename, encode_dict)
+                               split_filename, to_str)
 from .traits_extension import (
     traits, Undefined, TraitDictObject, TraitListObject, TraitError, isdefined, File,
     Directory, DictStrStr, has_metadata)
@@ -72,7 +72,7 @@ def __init__(self, value):
         self.value = value
 
     def __str__(self):
-        return repr(self.value)
+        return '{}'.format(self.value)
 
 def _exists_in_path(cmd, environ):
     """
@@ -271,7 +271,7 @@ def _get_bunch_hash(self):
         # Sort the items of the dictionary, before hashing the string
         # representation so we get a predictable order of the
         # dictionary.
-        sorted_dict = encode_dict(sorted(dict_nofilename.items()))
+        sorted_dict = to_str(sorted(dict_nofilename.items()))
         return dict_withhash, md5(sorted_dict.encode()).hexdigest()
 
     def __pretty__(self, p, cycle):
@@ -381,7 +381,7 @@ def __repr__(self):
         outstr = []
         for name, value in sorted(self.trait_get().items()):
             outstr.append('%s = %s' % (name, value))
-        return '\n' + '\n'.join(outstr) + '\n'
+        return '\n{}\n'.format('\n'.join(outstr))
 
     def _generate_handlers(self):
         """Find all traits with the 'xor' metadata and attach an event
@@ -581,7 +581,7 @@ def get_hashval(self, hash_method=None):
             dict_withhash.append((name,
                                   self._get_sorteddict(val, True, hash_method=hash_method,
                                                        hash_files=hash_files)))
-        return dict_withhash, md5(encode_dict(dict_nofilename).encode()).hexdigest()
+        return dict_withhash, md5(to_str(dict_nofilename).encode()).hexdigest()
 
 
     def _get_sorteddict(self, objekt, dictwithhash=False, hash_method=None,
@@ -808,10 +808,13 @@ def help(cls, returnhelp=False):
     def _refs_help(cls):
         """ Prints interface references.
         """
+        if not cls.references_:
+            return []
+
         helpstr = ['References::']
 
         for r in cls.references_:
-            helpstr += [repr(r['entry'])]
+            helpstr += ['{}'.format(r['entry'])]
 
         return helpstr
 

nipype/interfaces/fsl/dti.py

@@ -946,7 +946,7 @@ def _list_outputs(self):
             cwd, base_name = os.path.split(name)
             outputs['out_files'].append(self._gen_fname(
                 base_name, cwd=cwd,
-                suffix='_proj_seg_thr_' + repr(self.inputs.threshold)))
+                suffix='_proj_seg_thr_{}'.format(self.inputs.threshold)))
         return outputs
 
 

nipype/pipeline/engine/base.py

@@ -105,7 +105,7 @@ def __repr__(self):
         if self._hierarchy:
             return '.'.join((self._hierarchy, self._id))
         else:
-            return self._id
+            return '{}'.format(self._id)
 
     def save(self, filename=None):
         if filename is None: