Merge pull request #13 from hanke/enh/graphsubmission

Tiny bugfix for the CondorDAGMan plugin (plus a merged master branch, sorry)

Author: satra

nipype/pipeline/plugins/base.py

@@ -115,7 +115,9 @@ def create_pyscript(node, updatehash=False, store_exception=True):
 batchdir = '%s'
 try:
     from nipype import config, logging
-    from ordereddict import OrderedDict
+    import sys
+    if not sys.version_info < (2, 7):
+        from ordereddict import OrderedDict
     config_dict=%s
     config.update_config(config_dict)
     config.update_matplotlib()

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']