summaryrefslogtreecommitdiff
path: root/Lib/test/test_pep247.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/test/test_pep247.py')
-rw-r--r--Lib/test/test_pep247.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/Lib/test/test_pep247.py b/Lib/test/test_pep247.py
index 691c85a391..423d33383f 100644
--- a/Lib/test/test_pep247.py
+++ b/Lib/test/test_pep247.py
@@ -19,8 +19,8 @@ from test import test_support
class Pep247Test(unittest.TestCase):
def check_module(self, module, key=None):
- self.assert_(hasattr(module, 'digest_size'))
- self.assert_(module.digest_size is None or module.digest_size > 0)
+ self.assertTrue(hasattr(module, 'digest_size'))
+ self.assertTrue(module.digest_size is None or module.digest_size > 0)
if not key is None:
obj1 = module.new(key)
@@ -39,24 +39,24 @@ class Pep247Test(unittest.TestCase):
obj3.update('string')
h2 = obj3.digest()
- self.assertEquals(h1, h2)
+ self.assertEqual(h1, h2)
- self.assert_(hasattr(obj1, 'digest_size'))
+ self.assertTrue(hasattr(obj1, 'digest_size'))
if not module.digest_size is None:
- self.assertEquals(obj1.digest_size, module.digest_size)
+ self.assertEqual(obj1.digest_size, module.digest_size)
- self.assertEquals(obj1.digest_size, len(h1))
+ self.assertEqual(obj1.digest_size, len(h1))
obj1.update('string')
obj_copy = obj1.copy()
- self.assertEquals(obj1.digest(), obj_copy.digest())
- self.assertEquals(obj1.hexdigest(), obj_copy.hexdigest())
+ self.assertEqual(obj1.digest(), obj_copy.digest())
+ self.assertEqual(obj1.hexdigest(), obj_copy.hexdigest())
digest, hexdigest = obj1.digest(), obj1.hexdigest()
hd2 = ""
for byte in digest:
hd2 += '%02x' % ord(byte)
- self.assertEquals(hd2, hexdigest)
+ self.assertEqual(hd2, hexdigest)
def test_md5(self):
self.check_module(md5)