[oe] [STABLE][PATCH 2/2] patch.bbclass: use hashlib with Python 2.5+ - removes DeprecationWarning

Marcin Juszkiewicz marcin at juszkiewicz.com.pl
Tue May 12 18:25:13 UTC 2009


Patch.bbclass change removes DeprecationWarnings too but has to keep
compatibility with Python 2.4 so I had to use try/except block because
hashlib is 2.5+

Signed-off-by: Marcin Juszkiewicz <marcin at juszkiewicz.com.pl>
---
 classes/patch.bbclass |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/classes/patch.bbclass b/classes/patch.bbclass
index 075e826..8d2bde0 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:
-- 
1.6.3







More information about the Openembedded-devel mailing list