diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-08-02 03:14:27 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-08-02 03:14:27 (GMT) |
| commit | 38a5800cdca6ca11cd60ad07c520a512e88304de (patch) | |
| tree | f163f433c128a5691d37cff8549518ef5b085959 /Lib/test/test_userstring.py | |
| parent | 9c4fbdbc55f25a24a0ea137fecee5d880510fa9e (diff) | |
| download | cpython-38a5800cdca6ca11cd60ad07c520a512e88304de.zip cpython-38a5800cdca6ca11cd60ad07c520a512e88304de.tar.gz cpython-38a5800cdca6ca11cd60ad07c520a512e88304de.tar.bz2 | |
Merged revisions 77871,77910,77913 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77871 | ezio.melotti | 2010-01-31 13:46:54 +0200 (Sun, 31 Jan 2010) | 1 line
#7092: silence more -3 and -Wd warnings
........
r77910 | ezio.melotti | 2010-02-02 10:37:35 +0200 (Tue, 02 Feb 2010) | 1 line
#7092: silence py3k warnings for bsddb. Patch by Florent Xicluna.
........
r77913 | ezio.melotti | 2010-02-02 19:34:37 +0200 (Tue, 02 Feb 2010) | 1 line
#7092: Silence py3k warnings in test_exceptions and test_pep352. Patch by Florent Xicluna.
........
Diffstat (limited to 'Lib/test/test_userstring.py')
| -rwxr-xr-x | Lib/test/test_userstring.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_userstring.py b/Lib/test/test_userstring.py index 4bb0c45..ee7a1f4 100755 --- a/Lib/test/test_userstring.py +++ b/Lib/test/test_userstring.py @@ -136,7 +136,10 @@ class MutableStringTest(UserStringTest): def test_main(): with warnings.catch_warnings(): - warnings.filterwarnings("ignore", ".*MutableString", + warnings.filterwarnings("ignore", ".*MutableString has been removed", + DeprecationWarning) + warnings.filterwarnings("ignore", + ".*__(get|set|del)slice__ has been removed", DeprecationWarning) test_support.run_unittest(UserStringTest, MutableStringTest) |