From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1074B1384AC for ; Tue, 29 Oct 2013 02:18:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90759E0942; Tue, 29 Oct 2013 02:18:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2331DE0942 for ; Tue, 29 Oct 2013 02:18:54 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3669133EEB2 for ; Tue, 29 Oct 2013 02:18:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id F34BFE5461 for ; Tue, 29 Oct 2013 02:18:50 +0000 (UTC) From: "Devan Franchini" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Devan Franchini" Message-ID: <1383013020.c41a4b0cccc8425a9e00bd1c4cebaf50c058588f.twitch153@gentoo> Subject: [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/ X-VCS-Repository: proj/webapp-config X-VCS-Files: WebappConfig/compat.py X-VCS-Directories: WebappConfig/ X-VCS-Committer: twitch153 X-VCS-Committer-Name: Devan Franchini X-VCS-Revision: c41a4b0cccc8425a9e00bd1c4cebaf50c058588f X-VCS-Branch: master Date: Tue, 29 Oct 2013 02:18:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a63beeb4-b936-47cd-b06d-c5df9d105ae3 X-Archives-Hash: 9f5971a096f23355fb923b36e8f92124 commit: c41a4b0cccc8425a9e00bd1c4cebaf50c058588f Author: Devan Franchini gentoo org> AuthorDate: Tue Oct 29 02:17:00 2013 +0000 Commit: Devan Franchini gentoo org> CommitDate: Tue Oct 29 02:17:00 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=c41a4b0c WebappConfig/compat.py: Alters warped compat file from cherry-picking. --- WebappConfig/compat.py | 10 ---------- 1 file changed, 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. -