[gentoo-commits] proj/webapp-config:experimental commit in: WebappConfig/

["Devan Franchini" <twitch153@gentoo.org>]

commit:     781df726af2e16e10b89385a8daccd940eaf508a
Author:     Devan Franchini <twitch153 <AT> hotmail <DOT> com>
AuthorDate: Thu Oct 10 01:01:19 2013 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 01:01:19 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=781df726

WebappConfig/compat.py: Revamped create_md5() function for python3.2.

When creating md5 hashes for webapp files you need to encode the files
using utf-8. In order to encode these files there needs to be a
check to distinguish binary charsets from other files. Once this is
accomplished the script can correctly encode the files.

---
 WebappConfig/compat.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/WebappConfig/compat.py b/WebappConfig/compat.py
index 536bb2a..8d39faf 100644
--- a/WebappConfig/compat.py
+++ b/WebappConfig/compat.py
@@ -19,9 +19,15 @@ import  hashlib, os, os.path, sys
 
 def create_md5(filename):
     if hex(sys.hexversion) >= '0x3020000':
-        filename = open(filename).read()
-        encoded_file = filename.encode('utf8')
-        return str(hashlib.md5(encoded_file).hexdigest())
+        file_type = os.popen('file -bi ' + filename, 'r')
+        file_type = file_type.read()
+        if re.search("^.*charset=binary$", file_type):
+            filename = filename.encode('utf8')
+            return str(hashlib.md5(filename).hexdigest())
+        else:
+            filename = open(filename).read()
+            filename = filename.encode('utf8')
+            return str(hashlib.md5(filename).hexdigest())
     else:
         return str(hashlib.md5(open(filename).read()).hexdigest())