Fix a bug introduced by the addition of the 'record' argument to

test.test_support.catch_warning() where showwarning() was not being set
properly.

diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 25494a919ca0312dd6fd311c0bb8fa57c9ec79aa..9a45fdde8dca7809e0d6998d1851f73830837308 100644 (file)
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -406,11 +406,11 @@ def catch_warning(module=warnings, record=True):
             warnings.warn("foo")
             assert str(w.message) == "foo"
     """
+    original_filters = module.filters[:]
+    original_showwarning = module.showwarning
     if record:
         warning_obj = WarningMessage()
         module.showwarning = warning_obj._showwarning
-    original_filters = module.filters[:]
-    original_showwarning = module.showwarning
     try:
         yield warning_obj if record else None
     finally: