commit 3efafd77498def137f4afbcf2abee9aa2aed460a
author Ezio Melotti <ezio.melotti@gmail.com> Mon Aug 02 18:40:55 2010 +0000
committer Ezio Melotti <ezio.melotti@gmail.com> Mon Aug 02 18:40:55 2010 +0000
tree e491bca6f159d278f142478ad73b287cd20b958d
parent 5ff2745fed91dca3dca20360945562df70ed7767

Merged revisions 77942,79023 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77942 | ezio.melotti | 2010-02-03 07:37:26 +0200 (Wed, 03 Feb 2010) | 1 line

  #7092: Silence more py3k warnings. Patch by Florent Xicluna.
........
  r79023 | ezio.melotti | 2010-03-17 15:52:48 +0200 (Wed, 17 Mar 2010) | 1 line

  #7092: silence some more py3k warnings.
........

Lib/test/test_sys.py

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 980606d..fd6fb2b 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -75,7 +75,8 @@
             self.assert_(value is exc)
             self.assert_(traceback is not None)
 
-            sys.exc_clear()
+            with test.test_support._check_py3k_warnings():
+                sys.exc_clear()
 
             typ, value, traceback = sys.exc_info()
             self.assert_(typ is None)
@@ -498,7 +499,8 @@
         # bool
         check(True, size(h + 'l'))
         # buffer
-        check(buffer(''), size(h + '2P2Pil'))
+        with test.test_support._check_py3k_warnings():
+            check(buffer(''), size(h + '2P2Pil'))
         # builtin_function_or_method
         check(len, size(h + '3P'))
         # bytearray