Author: zmedico
Date: 2008-11-08 05:12:04 +0000 (Sat, 08 Nov 2008)
New Revision: 11828
Modified:
main/trunk/pym/portage/checksum.py
Log:
With python-2.6, importing the Crypto.Hash.MD5 and Crypto.Hash.SHA modules
from pycrypto triggers warnings since those modules are implemented using
the deprecated md5 and sha modules from python's stdlib. So, in order to
avoid the warning and the inferior hash implementations that come with them,
never use these particular modules from pycrypto. Instead, use hashlib or
directly use stdlib's md5 and sha modules if necessary. Thanks to Markus
Peloquin for reporting.
Modified: main/trunk/pym/portage/checksum.py
===================================================================
--- main/trunk/pym/portage/checksum.py 2008-11-08 00:55:40 UTC (rev 11827)
+++ main/trunk/pym/portage/checksum.py 2008-11-08 05:12:04 UTC (rev 11828)
@@ -61,10 +61,7 @@
# Use pycrypto when available, prefer it over the internal fallbacks
try:
- from Crypto.Hash import MD5, SHA, SHA256, RIPEMD
-
- md5hash = _generate_hash_function("MD5", MD5.new, origin="pycrypto")
- sha1hash = _generate_hash_function("SHA1", SHA.new, origin="pycrypto")
+ from Crypto.Hash import SHA256, RIPEMD
sha256hash = _generate_hash_function("SHA256", SHA256.new, origin="pycrypto")
rmd160hash = _generate_hash_function("RMD160", RIPEMD.new, origin="pycrypto")
except ImportError, e:
|
