BF(PY3): just catch all Exceptions, patch builtins module now provided in py3k

Author: yarikoptic

nibabel/optpkg.py

@@ -97,12 +97,11 @@ def optional_package(name, trip_msg=None, min_version=None):
     exc = None
     try:
         pkg = __import__(name, fromlist=fromlist)
-    except ImportError as exc:
-        pass
-    except Exception as exc:  # it failed to import for some other reason
+    except Exception as exc_:
+        # Could fail due to some ImportError or for some other reason
         # e.g. h5py might have been checking file system to support UTF-8
         # etc.  We should not blow if they blow
-        pass
+        exc = exc_  # So it is accessible outside of the code block
     else:  # import worked
         # top level module
         if check_version(pkg):

nibabel/py3k.py

@@ -41,6 +41,7 @@ def open_latin1(filename, mode='r'):
     ints2bytes = lambda seq: bytes(seq)
     ZEROB = bytes([0])
     FileNotFoundError = FileNotFoundError
+    import builtins
 else:
     import StringIO
     StringIO = BytesIO = StringIO.StringIO
@@ -66,6 +67,8 @@ def open_latin1(filename, mode='r'):
     class FileNotFoundError(IOError):
         pass
 
+    import __builtin__ as builtins
+
 
 def getexception():
     return sys.exc_info()[1]

nibabel/tests/test_optpkg.py

@@ -11,6 +11,7 @@
                         assert_equal)
 
 
+from nibabel.py3k import builtins
 from nibabel.optpkg import optional_package
 from nibabel.tripwire import TripWire, TripWireError
 
@@ -41,7 +42,7 @@ def raise_Exception(*args, **kwargs):
         raise Exception(
             "non ImportError could be thrown by some malfunctioning module "
             "upon import, and optional_package should catch it too")
-    with mock.patch('__builtin__.__import__', side_effect=raise_Exception):
+    with mock.patch.object(builtins, '__import__', side_effect=raise_Exception):
         assert_bad('nottriedbefore')