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

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

commit:     04e9a552778538887a686749c2cf423493212f8c
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 19 03:24:15 2013 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 19 03:24:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=04e9a552

WebappConfig/compat.py: Revamps create_md5() function.

This second revamp changes the way in which python is opening
the file to create an md5 hash of. Upon calling the open()
function it opens the file to read it, or as a binary. This
allows for consistent behavior when trying to open either a
binary file, or a text file to hash. This method is also much
cleaner and sufficient for forward and backwards compatibility.

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

diff --git a/WebappConfig/compat.py b/WebappConfig/compat.py
index 8d39faf..f7ae89f 100644
--- a/WebappConfig/compat.py
+++ b/WebappConfig/compat.py
@@ -15,19 +15,9 @@
 #
 # ========================================================================
 
-import  hashlib, os, os.path, sys
+import  hashlib
 
 def create_md5(filename):
-    if hex(sys.hexversion) >= '0x3020000':
-        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())
+    with open(filename, 'rb') as f:
+        return str(hashlib.md5(f.read()).hexdigest())