From: Brett Cannon <bcannon@gmail.com>
Date: Sun, 5 Apr 2009 18:57:32 +0000 (+0000)
Subject: Blocked revisions 71221 via svnmerge
X-Git-Tag: v3.1b1~377
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b9082a9591380cbfd961ef5273df36da5b1302a;p=python

Blocked revisions 71221 via svnmerge

........
  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
index a4da5daa0e..1463cf7a99 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -912,10 +912,10 @@ class EncodingTest(BaseTest):
 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")