fix(py27): uncaught exception in python 2

nipy · Aug 2, 2019 · 88b6fc0 · 88b6fc0
1 parent 7d92126
commit 88b6fc0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/nipype/pipeline/engine/utils.py b/nipype/pipeline/engine/utils.py
@@ -255,8 +255,6 @@ def load_resultfile(results_file):
     """
     aggregate = True
     results_file = Path(results_file)
-    path = '%s' % results_file.parents
-
     result = None
     attribute_error = False
     if results_file.exists():

diff --git a/nipype/utils/filemanip.py b/nipype/utils/filemanip.py
@@ -688,7 +688,7 @@ def loadpkl(infile, versioning=False):
         try:  # Look if pkl file contains version file
             pkl_metadata_line = pkl_file.readline()
             pkl_metadata = json.loads(pkl_metadata_line)
-        except UnicodeDecodeError:
+        except (UnicodeDecodeError, json.JSONDecodeError):
             pass
         finally:
             # Could not get version info