[pypy-commit] pypy py3k: digestsize is no longer needed in python 3

[dusty]

Author: Dusty Phillips <dusty at buchuki.com>
Branch: py3k
Changeset: r53400:0a27e18363d6
Date: 2012-03-12 16:36 -0700
http://bitbucket.org/pypy/pypy/changeset/0a27e18363d6/

Log:	digestsize is no longer needed in python 3

diff --git a/pypy/module/_hashlib/interp_hashlib.py b/pypy/module/_hashlib/interp_hashlib.py
--- a/pypy/module/_hashlib/interp_hashlib.py
+++ b/pypy/module/_hashlib/interp_hashlib.py
@@ -157,7 +157,6 @@
     hexdigest=interp2app(W_Hash.hexdigest),
     #
     digest_size=GetSetProperty(W_Hash.get_digest_size),
-    digestsize=GetSetProperty(W_Hash.get_digest_size),
     block_size=GetSetProperty(W_Hash.get_block_size),
     )
 W_Hash.acceptable_as_base_class = False
diff --git a/pypy/module/_hashlib/test/test_hashlib.py b/pypy/module/_hashlib/test/test_hashlib.py
--- a/pypy/module/_hashlib/test/test_hashlib.py
+++ b/pypy/module/_hashlib/test/test_hashlib.py
@@ -26,7 +26,6 @@
                                     }.items():
             h = hashlib.new(name)
             assert h.digest_size == expected_size
-            assert h.digestsize == expected_size
             #
             h.update(b'abc')
             h2 = h.copy()
@@ -46,7 +45,6 @@
             py_new = getattr(hashlib, '__get_builtin_constructor')
             h = py_new(name)('')
             assert h.digest_size == expected_size
-            assert h.digestsize == expected_size
             #
             h.update('abc')
             h2 = h.copy()
diff --git a/pypy/module/_md5/interp_md5.py b/pypy/module/_md5/interp_md5.py
--- a/pypy/module/_md5/interp_md5.py
+++ b/pypy/module/_md5/interp_md5.py
@@ -49,7 +49,6 @@
     hexdigest = interp2app(W_MD5.hexdigest_w),
     copy      = interp2app(W_MD5.copy_w),
     digest_size = 16,
-    digestsize = 16,
     block_size = 64,
     __doc__   = """md5(arg) -> return new md5 object.
 
diff --git a/pypy/module/_md5/test/test_md5.py b/pypy/module/_md5/test/test_md5.py
--- a/pypy/module/_md5/test/test_md5.py
+++ b/pypy/module/_md5/test/test_md5.py
@@ -24,11 +24,7 @@
         """
         md5.digest_size should be 16.
         """
-        import sys
         assert self.md5.md5().digest_size == 16
-        if sys.version_info >= (2, 5):
-            assert self.md5.blocksize == 1
-            assert self.md5.md5().digestsize == 16
 
 
     def test_MD5Type(self):