From 1fd6dc8a1fe32f58b2f5bb62a134e2f30847e578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 31 Oct 2009 19:32:20 +0100 Subject: [PATCH] Remove deprecated warning for md5 --- trytond/ir/attachment.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/trytond/ir/attachment.py b/trytond/ir/attachment.py index 420dd283de..28412fded4 100644 --- a/trytond/ir/attachment.py +++ b/trytond/ir/attachment.py @@ -4,7 +4,11 @@ from trytond.model import ModelView, ModelSQL, fields from trytond.config import CONFIG import os -import md5 +try: + import hashlib +except ImportError: + hashlib = None + import md5 import base64 class Attachment(ModelSQL, ModelView): @@ -68,7 +72,10 @@ class Attachment(ModelSQL, ModelView): if not os.path.isdir(directory): os.makedirs(directory, 0770) data = base64.decodestring(value) - digest = md5.new(data).hexdigest() + if hashlib: + digest = hashlib.md5(data).hexdigest() + else: + digest = md5.new(data).hexdigest() directory = os.path.join(directory, digest[0:2], digest[2:4]) if not os.path.isdir(directory): os.makedirs(directory, 0770)