Merged revisions 79165 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79165 | florent.xicluna | 2010-03-21 03:14:24 +0200 (Sun, 21 Mar 2010) | 2 lines
#7092 - Silence more py3k deprecation warnings, using test_support.check_py3k_warnings() helper.
........
diff --git a/Lib/test/test_StringIO.py b/Lib/test/test_StringIO.py
index 81f81e5..47a0715 100644
--- a/Lib/test/test_StringIO.py
+++ b/Lib/test/test_StringIO.py
@@ -137,12 +137,10 @@
def test_main():
- test_support.run_unittest(
- TestStringIO,
- TestcStringIO,
- TestBufferStringIO,
- TestBuffercStringIO
- )
+ test_support.run_unittest(TestStringIO, TestcStringIO)
+ with test_support._check_py3k_warnings(("buffer.. not supported",
+ DeprecationWarning)):
+ test_support.run_unittest(TestBufferStringIO, TestBuffercStringIO)
if __name__ == '__main__':
test_main()