FIX: Residual imports

Author: larsoner

bin/pysurfer

@@ -101,10 +101,8 @@ if __name__ == '__main__':
 
         # It's nice to have mlab in the namespace, but we'll import it
         # after the other stuff so getting usage is not interminable
-        try:
-            from mayavi import mlab
-        except ImportError:
-            from enthought.mayavi import mlab
+        from mayavi import mlab
+        assert mlab  # make pyflakes happy
 
         # Now clean up the namespace a bit
         del parser, args

surfer/tests/test_viz.py

@@ -7,11 +7,7 @@
 
 from surfer import Brain
 from surfer import io
-try:
-    from mayavi import mlab
-    assert mlab
-except ImportError:
-    from enthought.mayavi import mlab
+from mayavi import mlab
 
 if 'SUBJECTS_DIR' not in os.environ:
     raise ValueError('Test suite relies on the definition of SUBJECTS_DIR')