util: remove md5

This hash function is broken and should not be used by new code. It is
currently only used by keepalive.

mercurial/keepalive.py

@@ -21,6 +21,8 b''
 #  - fix for digest auth (inspired from urllib2.py @ Python v2.4)
 # Modified by Dirkjan Ochtman:
 #  - import md5 function from a local util module
+# Modified by Martin Geisler:
+#  - moved md5 function from local util module to this module
 
 """An HTTP handler for urllib2 that supports HTTP 1.1 and keepalive.
 
@@ -528,8 +530,16 b' def error_handler(url):'
     print "open connections:", hosts
     keepalive_handler.close_all()
 
+def md5(s):
+    try:
+        from hashlib import md5 as _md5
+    except ImportError:
+        from md5 import md5 as _md5
+    global md5
+    md5 = _md5
+    return _md5(s)
+
 def continuity(url):
-    from util import md5
     format = '%25s: %s'
 
     # first fetch the file with the normal http handler

mercurial/util.py

@@ -20,16 +20,6 b' import imp'
 
 # Python compatibility
 
-def md5(s):
-    try:
-        import hashlib
-        _md5 = hashlib.md5
-    except ImportError:
-        from md5 import md5 as _md5
-    global md5
-    md5 = _md5
-    return _md5(s)
-
 def sha1(s):
     try:
         import hashlib

tests/test-archive

@@ -75,7 +75,10 b' hg archive -t tgz -p %b-%h test-%h.tar.g'
 gzip -dc test-$QTIP.tar.gz | tar tf - 2>/dev/null | sed "s/$QTIP/TIP/"
 
 cat > md5comp.py <<EOF
-from mercurial.util import md5
+try:
+    from hashlib import md5
+except ImportError:
+    from md5 import md5
 import sys
 f1, f2 = sys.argv[1:3]
 h1 = md5(file(f1, 'rb').read()).hexdigest()