diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-04-02 18:52:12 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-04-02 18:52:12 (GMT) |
| commit | 41fe6155394edf0ef65d125b27ceb8d1e37f72d3 (patch) | |
| tree | 68af315f367bba93ba4d7d370e755bccd79c047f /Lib/test/test___all__.py | |
| parent | 1bfd0cc5d40018a6dd9f279d6d7acb829c76cc8f (diff) | |
| download | cpython-41fe6155394edf0ef65d125b27ceb8d1e37f72d3.zip cpython-41fe6155394edf0ef65d125b27ceb8d1e37f72d3.tar.gz cpython-41fe6155394edf0ef65d125b27ceb8d1e37f72d3.tar.bz2 | |
(partially)
Merged revisions 79534,79537,79539,79558,79606 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79534 | florent.xicluna | 2010-03-31 23:21:54 +0200 (mer, 31 mar 2010) | 2 lines
Fix test for xml.etree when using a non-ascii path. And use check_warnings instead of catch_warnings.
........
r79537 | florent.xicluna | 2010-03-31 23:40:32 +0200 (mer, 31 mar 2010) | 2 lines
Fix typo
........
r79539 | florent.xicluna | 2010-04-01 00:01:03 +0200 (jeu, 01 avr 2010) | 2 lines
Replace catch_warnings with check_warnings when it makes sense. Use assertRaises context manager to simplify some tests.
........
r79558 | florent.xicluna | 2010-04-01 20:17:09 +0200 (jeu, 01 avr 2010) | 2 lines
#7092: Fix some -3 warnings, and fix Lib/platform.py when the path contains a double-quote.
........
r79606 | florent.xicluna | 2010-04-02 19:26:42 +0200 (ven, 02 avr 2010) | 2 lines
Backport some robotparser test and skip the test if the external resource is not available.
........
Diffstat (limited to 'Lib/test/test___all__.py')
| -rw-r--r-- | Lib/test/test___all__.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py index 200db5c..695669a 100644 --- a/Lib/test/test___all__.py +++ b/Lib/test/test___all__.py @@ -2,7 +2,6 @@ import unittest from test import support import os import sys -import warnings class NoAll(RuntimeError): @@ -16,9 +15,8 @@ class AllTest(unittest.TestCase): def check_all(self, modname): names = {} - with warnings.catch_warnings(): - warnings.filterwarnings("ignore", ".* (module|package)", - DeprecationWarning) + with support.check_warnings((".* (module|package)", + DeprecationWarning), quiet=True): try: exec("import %s" % modname, names) except: |