From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2E88F139697 for ; Mon, 13 Mar 2017 21:46:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8BE67E0DEE; Mon, 13 Mar 2017 21:46:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68F75E0DEC for ; Mon, 13 Mar 2017 21:46:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98E1A340AC7 for ; Mon, 13 Mar 2017 21:46:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5EE4D6736 for ; Mon, 13 Mar 2017 21:46:45 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1489441589.3e5a2b3057bd77f965b30a80e4e914d428ad6617.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/checksum.py X-VCS-Directories: pym/portage/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3e5a2b3057bd77f965b30a80e4e914d428ad6617 X-VCS-Branch: master Date: Mon, 13 Mar 2017 21:46:45 +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: 217bb32c-71d7-485c-a3dc-344c30bc14e9 X-Archives-Hash: 96a2c7cb07643b3d7c705d3548a90dd1 commit: 3e5a2b3057bd77f965b30a80e4e914d428ad6617 Author: Michał Górny gentoo org> AuthorDate: Sun Mar 12 14:23:21 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Mar 13 21:46:29 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3e5a2b30 portage.checksum: Remove python-fchksum support Remove the support for MD5 implementation from python-fchksum package. The package is rarely installed, supports Python 2.7 only and the code handles checksumming a whole file only. pym/portage/checksum.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pym/portage/checksum.py b/pym/portage/checksum.py index 3e61acdec..9f88f7e65 100644 --- a/pym/portage/checksum.py +++ b/pym/portage/checksum.py @@ -19,7 +19,7 @@ import tempfile # most preferred first. Please keep this in sync with logic below. # ================================================================ # -# MD5: python-fchksum, hashlib, mhash +# MD5: hashlib, mhash # SHA1: hashlib, mhash # SHA256: hashlib, pycrypto, mhash # SHA512: hashlib, mhash @@ -186,15 +186,6 @@ if "WHIRLPOOL" not in hashfunc_map: from portage.util.whirlpool import new as _new_whirlpool whirlpoolhash = _generate_hash_function("WHIRLPOOL", _new_whirlpool, origin="bundled") -# Use python-fchksum if available, prefer it over all other MD5 implementations -try: - from fchksum import fmd5t as md5hash - hashfunc_map["MD5"] = md5hash - hashorigin_map["MD5"] = "python-fchksum" - -except ImportError: - pass - # There is only one implementation for size def getsize(filename): size = os.stat(filename).st_size