diff options
Diffstat (limited to 'numpy/tests/test_scripts.py')
| -rw-r--r-- | numpy/tests/test_scripts.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/numpy/tests/test_scripts.py b/numpy/tests/test_scripts.py index 489e0c6e5..675fe6575 100644 --- a/numpy/tests/test_scripts.py +++ b/numpy/tests/test_scripts.py @@ -11,8 +11,7 @@ from subprocess import Popen, PIPE import numpy as np from numpy.compat.py3k import basestring from nose.tools import assert_equal -from numpy.testing.decorators import skipif -from numpy.testing import assert_ +from numpy.testing import assert_, dec is_inplace = isfile(pathjoin(dirname(np.__file__), '..', 'setup.py')) @@ -59,7 +58,7 @@ def run_command(cmd, check_code=True): return proc.returncode, stdout, stderr -@skipif(is_inplace) +@dec.skipif(is_inplace) def test_f2py(): # test that we can run f2py script if sys.platform == 'win32': @@ -87,7 +86,7 @@ def test_f2py(): assert_equal(stdout.strip(), b'2') success = True break - except: + except Exception: pass msg = "Warning: neither %s nor %s nor %s found in path" % f2py_cmds assert_(success, msg) |