Merge remote-tracking branch 'upstream/master' into fix/use_current_prov

satra · satra · commit 88607588d0a2 · 2015-12-12T21:57:53.000-05:00
* upstream/master:
  add faulthandler
diff --git a/nipype/__init__.py b/nipype/__init__.py
@@ -17,6 +17,12 @@
 
 from .fixes.numpy.testing import nosetester
 
+try:
+    import faulthandler
+    faulthandler.enable()
+except ImportError:
+    pass
+
 
 class _NoseTester(nosetester.NoseTester):
     """ Subclass numpy's NoseTester to add doctests by default
