Blocked revisions 71221 via svnmerge

brettcannon · brettcannon · commit 5b9082a95913 · 2009-04-05T18:57:32.000Z
........ r71221 | vinay.sajip | 2009-04-05 04:06:24 -0700 (Sun, 05 Apr 2009) | 1 line Issue #5695: Moved logging.captureWarnings() call inside with statement in WarningsTest.test_warnings. ........
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
@@ -912,10 +912,10 @@ def test_encoding_cyrillic_unicode(self):
 class WarningsTest(BaseTest):
 
     def test_warnings(self):
-        logging.captureWarnings(True)
         with warnings.catch_warnings():
-            warnings.filterwarnings("always", category=UserWarning)
+            logging.captureWarnings(True)
             try:
+                warnings.filterwarnings("always", category=UserWarning)
                 file = io.StringIO()
                 h = logging.StreamHandler(file)
                 logger = logging.getLogger("py.warnings")
