diff mercurial/patch.py @ 6470:ac0bcd951c2c

python 2.6 compatibility: compatibility wrappers for hash functions
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 04 Apr 2008 22:36:40 +0200
parents 65029a3aafc2
children c2c4fa9af016
line wrap: on
line diff
--- a/mercurial/patch.py	Fri Apr 04 22:41:17 2008 +0200
+++ b/mercurial/patch.py	Fri Apr 04 22:36:40 2008 +0200
@@ -9,7 +9,7 @@
 from i18n import _
 from node import hex, nullid, short
 import base85, cmdutil, mdiff, util, context, revlog, diffhelpers, copies
-import cStringIO, email.Parser, os, popen2, re, sha, errno
+import cStringIO, email.Parser, os, popen2, re, errno
 import sys, tempfile, zlib
 
 class PatchError(Exception):
@@ -1120,7 +1120,7 @@
         if not text:
             return '0' * 40
         l = len(text)
-        s = sha.new('blob %d\0' % l)
+        s = util.sha1('blob %d\0' % l)
         s.update(text)
         return s.hexdigest()