From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R9uDY-0008J9-P3 for garchives@archives.gentoo.org; Sat, 01 Oct 2011 07:42:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10B1D21C0BB; Sat, 1 Oct 2011 07:41:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 899CB21C0A7 for ; Sat, 1 Oct 2011 07:41:01 +0000 (UTC) Received: from grubbs.orbis-terrarum.net (localhost [127.0.0.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D21141B4027 for ; Sat, 1 Oct 2011 07:41:00 +0000 (UTC) Received: (qmail 5090 invoked by uid 0); 1 Oct 2011 07:40:59 -0000 From: "Robin H. Johnson" To: gentoo-portage-dev@lists.gentoo.org Subject: [gentoo-portage-dev] [GLEP59v2 1/5] Refactor RMD160 hashlib code for less-hardcoding Date: Sat, 1 Oct 2011 07:40:51 +0000 Message-Id: <1317454855-2794-2-git-send-email-robbat2@gentoo.org> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1317454855-2794-1-git-send-email-robbat2@gentoo.org> References: <1317454855-2794-1-git-send-email-robbat2@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: X-Archives-Hash: dba5c188b9a0f3d3627853332ba469bc From: "Robin H. Johnson" To be used shortly for WHIRLPOOL as well as RMD160. Signed-off-by: Robin H. Johnson --- pym/portage/checksum.py | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pym/portage/checksum.py b/pym/portage/checksum.py index 9e7e455..e5455fa 100644 --- a/pym/portage/checksum.py +++ b/pym/portage/checksum.py @@ -82,19 +82,22 @@ except ImportError as e: # Use hashlib from python-2.5 if available and prefer it over pycrypto and internal fallbacks. # Need special handling for RMD160 as it may not always be provided by hashlib. try: - import hashlib + import hashlib, functools md5hash = _generate_hash_function("MD5", hashlib.md5, origin="hashlib") sha1hash = _generate_hash_function("SHA1", hashlib.sha1, origin="hashlib") sha256hash = _generate_hash_function("SHA256", hashlib.sha256, origin="hashlib") - try: - hashlib.new('ripemd160') - except ValueError: - pass - else: - def rmd160(): - return hashlib.new('ripemd160') - rmd160hash = _generate_hash_function("RMD160", rmd160, origin="hashlib") + for local_name, hash_name in (("rmd160", "ripemd160"), ): + try: + hashlib.new(hash_name) + except ValueError: + pass + else: + globals()['%shash' % local_name] = \ + _generate_hash_function(local_name.upper(), \ + functools.partial(hashlib.new, hash_name), \ + origin='hashlib') + except ImportError as e: pass -- 1.7.7