Merge pull request #1314 from poldrack/master

py3 and ipython fixes

Author: chrisgorgo

nipype/__init__.py

@@ -20,7 +20,7 @@
 try:
     import faulthandler
     faulthandler.enable()
-except:
+except (ImportError,IOError) as e:
     pass
 
 

nipype/interfaces/base.py

@@ -1271,9 +1271,16 @@ def _process(drain=0):
     if output == 'allatonce':
         stdout, stderr = proc.communicate()
         if stdout and isinstance(stdout, bytes):
-            stdout = stdout.decode()
+            try:
+                stdout = stdout.decode()
+            except UnicodeDecodeError:
+                stdout = stdout.decode("ISO-8859-1")
         if stderr and isinstance(stderr, bytes):
-            stderr = stderr.decode()
+            try:
+                stderr = stderr.decode()
+            except UnicodeDecodeError:
+                stderr = stderr.decode("ISO-8859-1")
+
         result['stdout'] = str(stdout).split('\n')
         result['stderr'] = str(stderr).split('\n')
         result['merged'] = ''