Merge branch 'master' of https://github.com/jokedurnez/nipype into jokedurnez-master

Author: oesteban

nipype/interfaces/fsl/model.py

@@ -209,10 +209,7 @@ def _create_ev_files(
                             raise Exception('FSL environment variables not set')
                         else:
                             ev_parameters['fsldir'] = '/usr/share/fsl'
-                    try:
-                        ev_parameters['temporalderiv'] = int(bool(ev_parameters.pop('derivs')))
-                    except KeyError:
-                        ev_parameters['temporalderiv'] = False
+                    ev_parameters['temporalderiv'] = bool(ev_parameters.get('derivs', False))
                     if ev_parameters['temporalderiv']:
                         evname.append(name + 'TD')
                         num_evs[1] += 1
@@ -393,9 +390,9 @@ def _list_outputs(self):
                         cwd, 'ev_%s_%d_%d.txt' % (name, runno,
                                                   len(evname)))
                     if field == 'cond':
-                        try:
-                            ev_parameters['temporalderiv'] = int(bool(ev_parameters.pop('derivs')))
-                        except KeyError:
+                        if 'derivs' in ev_parameters.keys():
+                            ev_parameters['temporalderiv'] = int(bool(ev_parameters['derivs']))
+                        else:
                             ev_parameters['temporalderiv'] = False
                         if ev_parameters['temporalderiv']:
                             evname.append(name + 'TD')