Remove roundup/anypy/hashlib_.py

The hashlib_ module was being used to provide backwards compatibility
for python v2.4. Roundup has dropped support for python v2.4 so we can
get rid of it.

Author: jerrykan

2to3-done.txt

@@ -90,7 +90,6 @@ TODO
 ./test/session_common.py
 ./test/test_actions.py
 ./test/test_anydbm.py
-./test/test_anypy_hashlib.py
 ./test/test_cgi.py
 ./test/test_dates.py
 ./test/test_hyperdbvals.py
@@ -148,7 +147,6 @@ NOTHING DONE
 ./roundup/__init__.py
 ./roundup/actions.py
 ./roundup/anypy/__init__.py
-./roundup/anypy/hashlib_.py
 ./roundup/anypy/sets_.py
 ./roundup/backends/blobfiles.py
 ./roundup/backends/indexer_xapian.py

roundup/anypy/README.txt

@@ -36,22 +36,4 @@ To avoid unnecessary imports, you can::
   except NameError:
       from roundup.anypy.sets_ import set
 
-hashlib_: md5/sha/hashlib compatibility
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The md5 and sha modules are deprecated since Python 2.6; the hashlib
-module, introduced with Python 2.5, is recommended instead.
-
-Change all::
-  import md5
-  md5.md5(), md5.new()
-  import sha
-  sha.sha(), sha.new()
-
-to::
-  from roundup.anypy.hashlib_ import md5
-  md5()
-  from roundup.anypy.hashlib_ import sha1
-  sha1()
-
 # vim: si

roundup/anypy/__init__.py

@@ -3,5 +3,5 @@
 """
 VERSION = '.'.join(map(str,
                        (0,
-                        1,  # hashlib_, sets_
+                        2,  # set_
                         )))

roundup/anypy/hashlib_.py

@@ -21,7 +21,7 @@
 __docformat__ = 'restructuredtext'
 
 import os, shutil
-from roundup.anypy.hashlib_ import sha1
+from hashlib import sha1
 
 sgml_file_types = [".xml", ".ent", ".html"]
 hash_file_types = [".py", ".sh", ".conf", ".cgi"]

roundup/install_util.py

@@ -21,7 +21,8 @@
 
 import re, string, random
 from base64 import b64encode, b64decode
-from roundup.anypy.hashlib_ import md5, sha1, shamodule
+from hashlib import md5, sha1
+
 try:
     import crypt
 except ImportError:
@@ -65,7 +66,7 @@ def xor_bytes(left, right):
     def _pbkdf2(password, salt, rounds, keylen):
         digest_size = 20 # sha1 generates 20-byte blocks
         total_blocks = int((keylen+digest_size-1)/digest_size)
-        hmac_template = HMAC(password, None, shamodule)
+        hmac_template = HMAC(password, None, sha1)
         out = _bempty
         for i in xrange(1, total_blocks+1):
             hmac = hmac_template.copy()

roundup/password.py

@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 import unittest, os, shutil, errno, sys, difflib, cgi, re
-from roundup.anypy.hashlib_ import sha1
+from hashlib import sha1
 
 from roundup import init, instance, password, hyperdb, date