[Zodb-checkins] SVN: ZODB/branches/3.9/src/ZODB/scripts/repozo.py The md5 package is deprecated in Python 2.6

[Chris Withers]

Log message for revision 105888:
  The md5 package is deprecated in Python 2.6

Changed:
  U   ZODB/branches/3.9/src/ZODB/scripts/repozo.py

-=-
Modified: ZODB/branches/3.9/src/ZODB/scripts/repozo.py
===================================================================
--- ZODB/branches/3.9/src/ZODB/scripts/repozo.py	2009-11-19 20:59:30 UTC (rev 105887)
+++ ZODB/branches/3.9/src/ZODB/scripts/repozo.py	2009-11-19 21:08:58 UTC (rev 105888)
@@ -65,7 +65,6 @@
 
 import os
 import sys
-import md5
 import gzip
 import time
 import errno
@@ -82,6 +81,12 @@
 READCHUNK = 16 * 1024
 VERBOSE = False
 
+if sys.version_info[1]>4:
+    # the hashlib package is available from Python 2.5
+    from hashlib import md5
+else:
+    # the md5 package is deprecated in Python 2.6
+    from md5 import new as md5
 
 def usage(code, msg=''):
     outfp = sys.stderr
@@ -210,7 +215,7 @@
 
 def checksum(fp, n):
     # Checksum the first n bytes of the specified file
-    sum = md5.new()
+    sum = md5()
     def func(data):
         sum.update(data)
     dofile(func, fp, n)
@@ -221,7 +226,7 @@
     # Copy bytes from file src, to file dst, starting at offset start, for n
     # length of bytes.  For robustness, we first write, flush and fsync
     # to a temp file, then rename the temp file at the end.
-    sum = md5.new()
+    sum = md5()
     ifp = open(options.file, 'rb')
     ifp.seek(start)
     tempname = os.path.join(os.path.dirname(dst), 'tmp.tmp')
@@ -248,7 +253,7 @@
     # Concatenate a bunch of files from the repository, output to `outfile' if
     # given.  Return the number of bytes written and the md5 checksum of the
     # bytes.
-    sum = md5.new()
+    sum = md5()
     def func(data):
         sum.update(data)
         if ofp: