| 1 |
commit: c41a4b0cccc8425a9e00bd1c4cebaf50c058588f |
| 2 |
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 29 02:17:00 2013 +0000 |
| 4 |
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 29 02:17:00 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=c41a4b0c |
| 7 |
|
| 8 |
WebappConfig/compat.py: Alters warped compat file from cherry-picking. |
| 9 |
|
| 10 |
--- |
| 11 |
WebappConfig/compat.py | 10 ---------- |
| 12 |
1 file changed, 10 deletions(-) |
| 13 |
|
| 14 |
diff --git a/WebappConfig/compat.py b/WebappConfig/compat.py |
| 15 |
index 526b1bc..3e567dc 100644 |
| 16 |
--- a/WebappConfig/compat.py |
| 17 |
+++ b/WebappConfig/compat.py |
| 18 |
@@ -18,15 +18,5 @@ |
| 19 |
import hashlib |
| 20 |
|
| 21 |
def create_md5(filename): |
| 22 |
-<<<<<<< HEAD |
| 23 |
- if hex(sys.hexversion) >= '0x3020000': |
| 24 |
- filename = open(filename).read() |
| 25 |
- encoded_file = filename.encode('utf8') |
| 26 |
- return str(hashlib.md5(encoded_file).hexdigest()) |
| 27 |
- else: |
| 28 |
- return str(hashlib.md5(open(filename).read()).hexdigest()) |
| 29 |
-======= |
| 30 |
with open(filename, 'rb') as f: |
| 31 |
return str(hashlib.md5(f.read()).hexdigest()) |
| 32 |
->>>>>>> 04e9a55... WebappConfig/compat.py: Revamps create_md5() function. |
| 33 |
- |
Archives