[Python-checkins] r71259 - in python/branches/py3k: Lib/test/test_logging.py

[brett.cannon]

Author: brett.cannon
Date: Sun Apr  5 20:57:32 2009
New Revision: 71259

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_logging.py

Modified: python/branches/py3k/Lib/test/test_logging.py
==============================================================================
--- python/branches/py3k/Lib/test/test_logging.py	(original)
+++ python/branches/py3k/Lib/test/test_logging.py	Sun Apr  5 20:57:32 2009
@@ -912,10 +912,10 @@
 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")