From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 3 Aug 2010 05:55:03 +0000 (+0000)
Subject: Fix deprecation warning in test_binascii.
X-Git-Tag: v2.6.6rc1~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73a5072534ede2ea00650cb9d48676d938988996;p=thirdparty%2FPython%2Fcpython.git

Fix deprecation warning in test_binascii.
---

diff --git a/Lib/test/test_binascii.py b/Lib/test/test_binascii.py
index 4ebf429ca6fe..7fb07be9cee3 100755
--- a/Lib/test/test_binascii.py
+++ b/Lib/test/test_binascii.py
@@ -26,10 +26,10 @@ class BinASCIITest(unittest.TestCase):
                 prefixes.extend(["crc_", "rlecode_", "rledecode_"])
             for prefix in prefixes:
                 name = prefix + suffix
-                self.assert_(callable(getattr(binascii, name)))
+                self.assertTrue(hasattr(getattr(binascii, name), '__call__'))
                 self.assertRaises(TypeError, getattr(binascii, name))
         for name in ("hexlify", "unhexlify"):
-            self.assert_(callable(getattr(binascii, name)))
+            self.assertTrue(hasattr(getattr(binascii, name), '__call__'))
             self.assertRaises(TypeError, getattr(binascii, name))
 
     def test_base64valid(self):