diff options
Diffstat (limited to 'numpy/testing/utils.py')
| -rw-r--r-- | numpy/testing/utils.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/numpy/testing/utils.py b/numpy/testing/utils.py index 16ed0f803..019adeb27 100644 --- a/numpy/testing/utils.py +++ b/numpy/testing/utils.py @@ -1,6 +1,8 @@ """ Utility function to facilitate testing. + """ +from __future__ import division import os import sys @@ -643,7 +645,7 @@ def assert_array_compare(comparison, x, y, err_msg='', verbose=True, names=('x', 'y')) if not cond : raise AssertionError(msg) - except ValueError, e: + except ValueError as e: import traceback efmt = traceback.format_exc() header = 'error during assertion:\n\n%s\n\n%s' % (efmt, header) @@ -881,7 +883,7 @@ def assert_array_less(x, y, err_msg='', verbose=True): header='Arrays are not less-ordered') def runstring(astr, dict): - exec astr in dict + exec(astr, dict) def assert_string_equal(actual, desired): """ @@ -1050,7 +1052,7 @@ def decorate_methods(cls, decorator, testmatch=None): # delayed import to reduce startup time from inspect import isfunction - methods = filter(isfunction, cls_attr.values()) + methods = [_m for _m in cls_attr.values() if isfunction(_m)] for function in methods: try: if hasattr(function, 'compat_func_name'): @@ -1108,7 +1110,7 @@ def measure(code_str,times=1,label=None): elapsed = jiffies() while i < times: i += 1 - exec code in globs,locs + exec(code, globs,locs) elapsed = jiffies() - elapsed return 0.01*elapsed |