From 31bdfe582e894a78e63d05dcfbde85d01d34ddb5 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 12 May 2009 18:30:18 +0200 Subject: patch.bbclass: use hashlib with Python 2.5+ - removes DeprecationWarning --- meta/classes/patch.bbclass | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index 5263089916..a92d26c030 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -7,10 +7,18 @@ def patch_init(d): import os, sys def md5sum(fname): - import md5, sys + import sys + + # when we move to Python 2.5 as minimal supported + # we can kill that try/except as hashlib is 2.5+ + try: + import hashlib + m = hashlib.md5() + except ImportError: + import md5 + m = md5.new() f = file(fname, 'rb') - m = md5.new() while True: d = f.read(8096) if not d: -- cgit v1.2.3-54-g00ecf