patch.bbclass: use hashlib with Python 2.5+ - removes DeprecationWarning
authorMarcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Tue, 12 May 2009 16:30:18 +0000 (18:30 +0200)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 May 2009 16:35:10 +0000 (18:35 +0200)
classes/patch.bbclass

index 075e826..8d2bde0 100644 (file)
@@ -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: