summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_class.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_class.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_class.py')
-rw-r--r--Lib/test/test_class.py10
1 files changed, 7 insertions, 3 deletions
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 @@ class ClassTests(unittest.TestCase):
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 @@ class ClassTests(unittest.TestCase):
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 @@ class ClassTests(unittest.TestCase):
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()