[gentoo-commits] portage r10854 - main/trunk/pym/portage

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-06-30 03:18:07 +0000 (Mon, 30 Jun 2008)
New Revision: 10854

Modified:
   main/trunk/pym/portage/checksum.py
Log:
Avoid python-2.6 deprecation warnings for md5 and sha modules by trying
to import hashlib first and then falling back to the deprecated modules
if necessary. Thanks to ColdWind for reporting.


Modified: main/trunk/pym/portage/checksum.py
===================================================================
--- main/trunk/pym/portage/checksum.py	2008-06-30 02:34:16 UTC (rev 10853)
+++ main/trunk/pym/portage/checksum.py	2008-06-30 03:18:07 UTC (rev 10854)
@@ -11,7 +11,6 @@
 import portage.exception
 import portage.process
 import commands
-import md5, sha
 
 #dict of all available hash functions
 hashfunc_map = {}
@@ -46,9 +45,20 @@
 # override earlier ones
 
 # Use the internal modules as last fallback
-md5hash = _generate_hash_function("MD5", md5.new, origin="internal")
-sha1hash = _generate_hash_function("SHA1", sha.new, origin="internal")
+try:
+	from hashlib import md5 as _new_md5
+except ImportError:
+	from md5 import new as _new_md5
 
+md5hash = _generate_hash_function("MD5", _new_md5, origin="internal")
+
+try:
+	from hashlib import sha1 as _new_sha1
+except ImportError:
+	from sha import new as _new_sha1
+
+sha1hash = _generate_hash_function("SHA1", _new_sha1, origin="internal")
+
 # Use pycrypto when available, prefer it over the internal fallbacks
 try:
 	from Crypto.Hash import MD5, SHA, SHA256, RIPEMD

-- 
gentoo-commits@l.g.o mailing list