diff options
| author |   Devan Franchini <twitch153@gentoo.org> | 2013-10-28 22:17:00 -0400 |
|---|---|---|
| committer | Devan Franchini <twitch153@gentoo.org> | 2013-10-28 22:17:00 -0400 |
| commit | c41a4b0cccc8425a9e00bd1c4cebaf50c058588f (patch) | |
| tree | abb1caffc471fbefa34b6cb631674fb5b33179a7 | |
| parent | WebappConfig/config.py: Corrects get() function arguments. (diff) | |
| download | webapp-config-c41a4b0cccc8425a9e00bd1c4cebaf50c058588f.tar.gz webapp-config-c41a4b0cccc8425a9e00bd1c4cebaf50c058588f.tar.bz2 webapp-config-c41a4b0cccc8425a9e00bd1c4cebaf50c058588f.zip | |
WebappConfig/compat.py: Alters warped compat file from cherry-picking.
| -rw-r--r-- | WebappConfig/compat.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/WebappConfig/compat.py b/WebappConfig/compat.py index 526b1bc..3e567dc 100644 --- a/WebappConfig/compat.py +++ b/WebappConfig/compat.py @@ -18,15 +18,5 @@ import hashlib def create_md5(filename): -<<<<<<< HEAD - if hex(sys.hexversion) >= '0x3020000': - filename = open(filename).read() - encoded_file = filename.encode('utf8') - return str(hashlib.md5(encoded_file).hexdigest()) - else: - return str(hashlib.md5(open(filename).read()).hexdigest()) -======= with open(filename, 'rb') as f: return str(hashlib.md5(f.read()).hexdigest()) ->>>>>>> 04e9a55... WebappConfig/compat.py: Revamps create_md5() function. - |