From 723861933c004d4bd08103b346cd41206bb055f9 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 12 Jan 2011 23:34:36 +0100 Subject: [PATCH] [FIX] base_crypt: use hashlib.md5 instead of md5.md5 for python 2.5+ This also takes care of the DeprecationWarning for Python 2.5+ bzr revid: odo@openerp.com-20110112223436-9ian2damgzh0qoev --- addons/base_crypt/crypt.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py index 2aa7accce42..98c36744ef1 100755 --- a/addons/base_crypt/crypt.py +++ b/addons/base_crypt/crypt.py @@ -64,11 +64,15 @@ def gen_salt( length=8, symbols=letters + digits ): # * # * Poul-Henning Kamp -import md5 +from sys import version_info +if version_info < (2,5): + from md5 import md5 +else: + from hashlib import md5 def encrypt_md5( raw_pw, salt, magic=magic_md5 ): - hash = md5.new( raw_pw + magic + salt ) - stretch = md5.new( raw_pw + salt + raw_pw).digest() + hash = md5( raw_pw + magic + salt ) + stretch = md5( raw_pw + salt + raw_pw).digest() for i in range( 0, len( raw_pw ) ): hash.update( stretch[i % 16] ) @@ -85,7 +89,7 @@ def encrypt_md5( raw_pw, salt, magic=magic_md5 ): saltedmd5 = hash.digest() for i in range( 1000 ): - hash = md5.new() + hash = md5() if i & 1: hash.update( raw_pw )