diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-08-02 19:56:05 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-08-02 19:56:05 (GMT) |
| commit | a65e2afe804743332b37234d66c7fe0789da760d (patch) | |
| tree | 40668ea69e19b7780617ffb21a986bc3a2aebdfe /Lib/test/test_heapq.py | |
| parent | edabc7bca29766539bfbaa2e25aac8fdc79bdb60 (diff) | |
| download | cpython-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_heapq.py')
| -rw-r--r-- | Lib/test/test_heapq.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_heapq.py b/Lib/test/test_heapq.py index f91d86d..efd1080 100644 --- a/Lib/test/test_heapq.py +++ b/Lib/test/test_heapq.py @@ -358,7 +358,10 @@ class TestErrorHandling(unittest.TestCase): for f in (self.module.nlargest, self.module.nsmallest): for s in ("123", "", range(1000), ('do', 1.2), xrange(2000,2200,5)): for g in (G, I, Ig, L, R): - self.assertEqual(f(2, g(s)), f(2,s)) + with test_support._check_py3k_warnings( + ("comparing unequal types not supported", + DeprecationWarning), quiet=True): + self.assertEqual(f(2, g(s)), f(2,s)) self.assertEqual(f(2, S(s)), []) self.assertRaises(TypeError, f, 2, X(s)) self.assertRaises(TypeError, f, 2, N(s)) |