From b6e81ddf0204e30f09cabe15c76ad5ddcb87c7d7 Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Wed, 7 Dec 2016 17:16:04 -0700 Subject: BUG: Fix suppress_warnings (again) for Python 3.6. The Python 3.6 changes that resulted in the 6b49167c fix has been fixed in Python 3.6.0rc1. So revert our fixes. --- numpy/testing/utils.py | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'numpy/testing/utils.py') diff --git a/numpy/testing/utils.py b/numpy/testing/utils.py index e2162acf9..0986686c0 100644 --- a/numpy/testing/utils.py +++ b/numpy/testing/utils.py @@ -2121,8 +2121,6 @@ class suppress_warnings(object): raise RuntimeError("cannot enter suppress_warnings twice.") self._orig_show = warnings.showwarning - if hasattr(warnings, "_showwarnmsg"): - self._orig_showmsg = warnings._showwarnmsg self._filters = warnings.filters warnings.filters = self._filters[:] @@ -2146,26 +2144,18 @@ class suppress_warnings(object): module=module_regex) self._tmp_modules.add(mod) warnings.showwarning = self._showwarning - if hasattr(warnings, "_showwarnmsg"): - warnings._showwarnmsg = self._showwarnmsg self._clear_registries() return self def __exit__(self, *exc_info): warnings.showwarning = self._orig_show - if hasattr(warnings, "_showwarnmsg"): - warnings._showwarnmsg = self._orig_showmsg warnings.filters = self._filters self._clear_registries() self._entered = False del self._orig_show del self._filters - def _showwarnmsg(self, msg): - self._showwarning(msg.message, msg.category, msg.filename, msg.lineno, - msg.file, msg.line, use_warnmsg=msg) - def _showwarning(self, message, category, filename, lineno, *args, **kwargs): use_warnmsg = kwargs.pop("use_warnmsg", None) -- cgit v1.2.1