changeset 11946 | 851161f07068 |
parent 11759 | 05deba16c5d5 |
child 11988 | 8380ed691df8 |
--- a/mercurial/util.py Wed Aug 11 20:28:39 2010 +0800 +++ b/mercurial/util.py Tue Aug 17 17:38:19 2010 -0500 @@ -28,9 +28,9 @@ # This function will import sha1 from hashlib or sha (whichever is # available) and overwrite itself with it on the first call. # Subsequent calls will go directly to the imported function. - try: + if sys.version_info >= (2, 5): from hashlib import sha1 as _sha1 - except ImportError: + else: from sha import sha as _sha1 global _fastsha1, sha1 _fastsha1 = sha1 = _sha1