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 45E3A1381F3 for ; Tue, 24 Sep 2013 18:20:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8C60E0B09; Tue, 24 Sep 2013 18:20:38 +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 231A9E0B09 for ; Tue, 24 Sep 2013 18:20:38 +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 3A88633EDBC for ; Tue, 24 Sep 2013 18:20:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E815CE5460 for ; Tue, 24 Sep 2013 18:20:35 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1380046810.e279816d1bf27cfd83796c1d46d4a0cd08f76e67.blueness@gentoo> Subject: [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/ X-VCS-Repository: proj/webapp-config X-VCS-Files: WebappConfig/content.py X-VCS-Directories: WebappConfig/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: e279816d1bf27cfd83796c1d46d4a0cd08f76e67 X-VCS-Branch: master Date: Tue, 24 Sep 2013 18:20:35 +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: be570f8e-5540-4745-bc06-518d96273019 X-Archives-Hash: acf14aff3b1cf62033f9144997825dba commit: e279816d1bf27cfd83796c1d46d4a0cd08f76e67 Author: Devan Franchini hotmail com> AuthorDate: Mon Sep 23 01:08:18 2013 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Sep 24 18:20:10 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=e279816d WebappConfig/content.py: Adds use of create_md5() function. This update adds the use of compat.py into content.py and makes use of the create_md5() function. Signed-off-by: Anthony G. Basile gentoo.org> --- WebappConfig/content.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebappConfig/content.py b/WebappConfig/content.py index 966a9cd..7eff223 100644 --- a/WebappConfig/content.py +++ b/WebappConfig/content.py @@ -26,7 +26,7 @@ import hashlib, re, os, os.path from WebappConfig.debug import OUT from WebappConfig.permissions import PermissionMap - +from WebappConfig.compat import create_md5 # ======================================================================== # Content handler # ------------------------------------------------------------------------ @@ -531,7 +531,7 @@ class Contents: def file_md5(self, filename): ''' Return the md5 hash for the file content.''' - return str(hashlib.md5(open(filename).read()).hexdigest()) + create_md5(filename) def file_time(self, filename): ''' Return the last modification time.'''