Merge pull request #1075 from larsoner/tb

BUG: Dont hold the exception

Author: JuliaSprenger

neo/io/stimfitio.py

@@ -32,15 +32,6 @@
 from neo.io.baseio import BaseIO
 from neo.core import Block, Segment, AnalogSignal
 
-try:
-    import stfio
-except ImportError as err:
-    HAS_STFIO = False
-    STFIO_ERR = err
-else:
-    HAS_STFIO = True
-    STFIO_ERR = None
-
 
 class StimfitIO(BaseIO):
     """
@@ -99,8 +90,9 @@ def __init__(self, filename=None):
         Arguments:
             filename : Either a filename or a stfio Recording object
         """
-        if not HAS_STFIO:
-            raise STFIO_ERR
+        # We need this module, so try importing now so that it fails on
+        # instantiation rather than read_block
+        import stfio  # noqa
 
         BaseIO.__init__(self)
 
@@ -112,6 +104,7 @@ def __init__(self, filename=None):
             self.filename = None
 
     def read_block(self, lazy=False):
+        import stfio
         assert not lazy, 'Do not support lazy'
 
         if self.filename is not None:

neo/test/iotest/test_stimfitio.py

@@ -8,9 +8,15 @@
 import unittest
 
 from neo.io import StimfitIO
-from neo.io.stimfitio import HAS_STFIO
 from neo.test.iotest.common_io_test import BaseTestIO
 
+try:
+    import stfio
+except Exception:
+    HAS_STFIO = False
+else:
+    HAS_STFIO = True
+
 
 @unittest.skipIf(sys.version_info[0] > 2, "not Python 3 compatible")
 @unittest.skipUnless(HAS_STFIO, "requires stfio")