[Checkins] SVN: zope.app.authentication/trunk/ Fix deprecation warning on Python 2.6

[Philipp von Weitershausen]

Log message for revision 92263:
  Fix deprecation warning on Python 2.6
  

Changed:
  U   zope.app.authentication/trunk/CHANGES.txt
  U   zope.app.authentication/trunk/src/zope/app/authentication/password.py

-=-
Modified: zope.app.authentication/trunk/CHANGES.txt
===================================================================
--- zope.app.authentication/trunk/CHANGES.txt	2008-10-15 21:22:02 UTC (rev 92262)
+++ zope.app.authentication/trunk/CHANGES.txt	2008-10-15 21:31:02 UTC (rev 92263)
@@ -5,7 +5,7 @@
 Version 3.4.4 (unreleased)
 --------------------------
 
-- ...
+- Fix deprecation warning on Python 2.6.
 
 Version 3.4.3 (2008-08-07)
 --------------------------

Modified: zope.app.authentication/trunk/src/zope/app/authentication/password.py
===================================================================
--- zope.app.authentication/trunk/src/zope/app/authentication/password.py	2008-10-15 21:22:02 UTC (rev 92262)
+++ zope.app.authentication/trunk/src/zope/app/authentication/password.py	2008-10-15 21:31:02 UTC (rev 92263)
@@ -17,8 +17,13 @@
 """
 __docformat__ = 'restructuredtext'
 
-import md5
-import sha
+try:
+    from hashlib import md5, sha1
+except ImportError:
+    # Python 2.4
+    from md5 import new as md5
+    from sha import new as sha1
+
 from random import randint
 from codecs import getencoder
 
@@ -95,7 +100,7 @@
     def encodePassword(self, password, salt=None):
         if salt is None:
             salt = "%08x" % randint(0, 0xffffffff)
-        return salt + md5.new(_encoder(password)[0]).hexdigest()
+        return salt + md5(_encoder(password)[0]).hexdigest()
 
     def checkPassword(self, storedPassword, password):
         salt = storedPassword[:-32]
@@ -137,7 +142,7 @@
     def encodePassword(self, password, salt=None):
         if salt is None:
             salt = "%08x" % randint(0, 0xffffffff)
-        return salt + sha.new(_encoder(password)[0]).hexdigest()
+        return salt + sha1(_encoder(password)[0]).hexdigest()
 
     def checkPassword(self, storedPassword, password):
         salt = storedPassword[:-40]