Merged revisions 82351 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82351 | brian.curtin | 2010-06-28 19:14:28 -0500 (Mon, 28 Jun 2010) | 3 lines

  Update md5driver.py for 3.x.
  Changed an import, replaced md5.new() with md5(), and added an encode where needed.
........

diff --git a/Demo/md5test/md5driver.py b/Demo/md5test/md5driver.py
index ea30fd84d86a34e0d9879afff35a5eebbf6409ca..7df3e757b095612d6cf5e02cb773235a07aca414 100755 (executable)
--- a/Demo/md5test/md5driver.py
+++ b/Demo/md5test/md5driver.py
@@ -1,11 +1,10 @@
+from hashlib import md5
 import string
-import md5
 from sys import argv
 
 def MDPrint(str):
     outstr = ''
-    for i in str:
-        o = ord(i)
+    for o in str:
         outstr = (outstr
                   + string.hexdigits[(o >> 4) & 0xF]
                   + string.hexdigits[o & 0xF])
@@ -42,7 +41,7 @@ def MDTimeTrial():
     print('MD5 time trial. Processing', TEST_BYTES, 'characters...')
     t1 = time()
 
-    mdContext = md5.new()
+    mdContext = md5()
 
     for i in range(TEST_BLOCKS):
         mdContext.update(data)
@@ -57,13 +56,13 @@ def MDTimeTrial():
 
 
 def MDString(str):
-    MDPrint(md5.new(str).digest())
+    MDPrint(md5(str.encode("utf-8")).digest())
     print('"' + str + '"')
 
 
 def MDFile(filename):
     f = open(filename, 'rb')
-    mdContext = md5.new()
+    mdContext = md5()
 
     while 1:
         data = f.read(1024)
@@ -78,7 +77,7 @@ def MDFile(filename):
 import sys
 
 def MDFilter():
-    mdContext = md5.new()
+    mdContext = md5()
 
     while 1:
         data = sys.stdin.read(16)