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_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 @@
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"))