Merge pull request #456 from satra/enh/graphsubmission

Enh/graphsubmission

Author: satra

nipype/pipeline/plugins/base.py

@@ -108,21 +108,20 @@ def create_pyscript(node, updatehash=False, store_exception=True):
     # create python script to load and trap exception
     cmdstr = """import os
 import sys
+from nipype import config, logging
+from nipype.utils.filemanip import loadpkl, savepkl
 from socket import gethostname
 from traceback import format_exception
 info = None
 pklfile = '%s'
 batchdir = '%s'
 try:
-    from nipype import config, logging
-    import sys
     if not sys.version_info < (2, 7):
-        from ordereddict import OrderedDict
+        from collections import OrderedDict
     config_dict=%s
     config.update_config(config_dict)
     config.update_matplotlib()
     logging.update_logging(config)
-    from nipype.utils.filemanip import loadpkl, savepkl
     traceback=None
     cwd = os.getcwd()
     info = loadpkl(pklfile)

nipype/pipeline/plugins/dagman.py

@@ -35,7 +35,7 @@ def __init__(self, **kwargs):
         self._template = "universe = vanilla\nnotification = Never"
         self._submit_specs = ""
         self._dagman_args = ""
-        if 'plugin_args' in kwargs:
+        if 'plugin_args' in kwargs and not kwargs['plugin_args'] is None:
             plugin_args = kwargs['plugin_args']
             if 'template' in plugin_args:
                 self._template = plugin_args['template']