Ticket #7458: trac-0.11.2-hashlib.patch

contrib/htdigest.py

@@ -21 +21 @@
 from optparse import OptionParser
 from getpass import getpass
 
-# The md5 module is deprecated in Python 2.5
+# The md5 module is deprecated in Python 2.6
 try:
     from hashlib import md5
 except ImportError:

trac/util/compat.py

@@ -141 +141 @@
         return newfunc
 
 
-# The md5 module is deprecated in Python 2.5
+# The md5 module is deprecated in Python 2.6
 try:
     from hashlib import md5
 except ImportError:
     from md5 import md5
+
+# The sha module is deprecated in Python 2.6
+try:
+    from hashlib import sha1 as sha
+except ImportError:
+    from sha import sha

trac/util/__init__.py

@@ -28 +28 @@
 
 # Imports for backward compatibility
 from trac.core import TracError
-from trac.util.compat import reversed, sorted, tee, md5
+from trac.util.compat import reversed, sorted, tee, md5, sha
 from trac.util.html import escape, unescape, Markup, Deuglifier
 from trac.util.text import CRLF, to_utf8, to_unicode, shorten_line, \
                            wrap, pretty_size
@@ -254 +254 @@
 # -- crypto utils
 
 def hex_entropy(bytes=32):
-    import sha
     import random
-    return sha.new(str(random.random())).hexdigest()[:bytes]
+    return sha(str(random.random())).hexdigest()[:bytes]
 
 
 # Original license for md5crypt: