summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_marshal.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_marshal.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_marshal.py')
-rw-r--r--Lib/test/test_marshal.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py
index 0dd59d1..1365851 100644
--- a/Lib/test/test_marshal.py
+++ b/Lib/test/test_marshal.py
@@ -129,7 +129,9 @@ class StringTestCase(unittest.TestCase):
def test_buffer(self):
for s in ["", "Andrč Previn", "abc", " "*10000]:
- b = buffer(s)
+ with test_support._check_py3k_warnings(("buffer.. not supported",
+ DeprecationWarning)):
+ b = buffer(s)
new = marshal.loads(marshal.dumps(b))
self.assertEqual(s, new)
marshal.dump(b, file(test_support.TESTFN, "wb"))