diff options
Diffstat (limited to 'numpy/testing/decorators.py')
| -rw-r--r-- | numpy/testing/decorators.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/numpy/testing/decorators.py b/numpy/testing/decorators.py index b0ddb1880..8d1fb04bb 100644 --- a/numpy/testing/decorators.py +++ b/numpy/testing/decorators.py @@ -15,11 +15,8 @@ function name, setup and teardown functions and so on - see """ from __future__ import division, absolute_import, print_function -import warnings import sys - -from numpy.testing.utils import \ - WarningManager, WarningMessage +import warnings import collections def slow(t): @@ -253,10 +250,8 @@ def deprecated(conditional=True): def _deprecated_imp(*args, **kwargs): # Poor man's replacement for the with statement - ctx = WarningManager(record=True) - l = ctx.__enter__() - warnings.simplefilter('always') - try: + with warnings.catch_warnings(record=True) as l: + warnings.simplefilter('always') f(*args, **kwargs) if not len(l) > 0: raise AssertionError("No warning raised when calling %s" @@ -264,8 +259,6 @@ def deprecated(conditional=True): if not l[0].category is DeprecationWarning: raise AssertionError("First warning for %s is not a " \ "DeprecationWarning( is %s)" % (f.__name__, l[0])) - finally: - ctx.__exit__() if isinstance(conditional, collections.Callable): cond = conditional() |