Merge pull request #7 from chrisfilo/enh/distlogging

Enh/distlogging

Author: satra

nipype/pipeline/engine.py

@@ -1094,8 +1094,8 @@ def run(self, updatehash=False):
                             except:
                                 pass
                             else:
-                                logdebug_dict_differences(prev_inputs,
-                                                          hashed_inputs)
+                                logging.logdebug_dict_differences(prev_inputs,
+                                                                  hashed_inputs)
                 if (str2bool(self.config['execution']['stop_on_first_rerun']) and
                     not (self.overwrite == None and self._interface.always_run)):
                     raise Exception(("Cannot rerun when 'stop_on_first_rerun' "

nipype/pipeline/plugins/base.py

@@ -494,7 +494,8 @@ def _submit_job(self, node, updatehash=False):
                                'result_%%s.pklz'%%info['node'].name)
     savepkl(resultsfile, dict(result=result, hostname=gethostname(),
                               traceback=traceback))
-""" % (node.config, pkl_file, batch_dir, suffix)
+"""
+        cmdstr = cmdstr % (node.config, pkl_file, batch_dir, suffix)
         pyscript = os.path.join(batch_dir, 'pyscript_%s.py' % suffix)
         fp = open(pyscript, 'wt')
         fp.writelines(cmdstr)