Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into afeb9260-tmp

1 files changed, 10 insertions, 2 deletions

diff --git a/classes/patch.bbclass b/classes/patch.bbclass
index 075e826523..8d2bde0c4f 100644
--- a/classes/patch.bbclass
+++ b/classes/patch.bbclass
@@ -13,14 +13,22 @@ def patch_init(d):
 			return "Error: %s not found." % self.path
 
 	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()
 
 		try:
 			f = file(fname, 'rb')
 		except IOError:
 			raise NotFoundError(fname)
 
-		m = md5.new()
 		while True:
 			d = f.read(8096)
 			if not d: