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_class.py b/Lib/test/test_class.py
index fc61d21..c2d3c54 100644
--- a/Lib/test/test_class.py
+++ b/Lib/test/test_class.py
@@ -407,7 +407,7 @@
self.assertCallStack([("__coerce__", (testme, 1)), ('__cmp__', (testme, 1))])
callLst[:] = []
- testme <> 1 # XXX kill this in py3k
+ eval('testme <> 1') # XXX kill this in py3k
self.assertCallStack([("__coerce__", (testme, 1)), ('__cmp__', (testme, 1))])
callLst[:] = []
@@ -427,7 +427,7 @@
self.assertCallStack([("__coerce__", (testme, 1)), ('__cmp__', (1, testme))])
callLst[:] = []
- 1 <> testme
+ eval('1 <> testme')
self.assertCallStack([("__coerce__", (testme, 1)), ('__cmp__', (1, testme))])
callLst[:] = []
@@ -616,7 +616,11 @@
hash(a.f)
def test_main():
- test_support.run_unittest(ClassTests)
+ with test_support._check_py3k_warnings(
+ (".+__(get|set|del)slice__ has been removed", DeprecationWarning),
+ ("classic int division", DeprecationWarning),
+ ("<> not supported", DeprecationWarning)):
+ test_support.run_unittest(ClassTests)
if __name__=='__main__':
test_main()