summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_StringIO.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-08-02 19:56:05 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-08-02 19:56:05 (GMT)
commita65e2afe804743332b37234d66c7fe0789da760d (patch)
tree40668ea69e19b7780617ffb21a986bc3a2aebdfe /Lib/test/test_StringIO.py
parentedabc7bca29766539bfbaa2e25aac8fdc79bdb60 (diff)
downloadcpython-a65e2afe804743332b37234d66c7fe0789da760d.zip
cpython-a65e2afe804743332b37234d66c7fe0789da760d.tar.gz
cpython-a65e2afe804743332b37234d66c7fe0789da760d.tar.bz2
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. ........
Diffstat (limited to 'Lib/test/test_StringIO.py')
-rw-r--r--Lib/test/test_StringIO.py10
1 files changed, 4 insertions, 6 deletions
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 @@ class TestBuffercStringIO(TestcStringIO):
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()