SVN: ZODB/branches/3.9/src/ZODB/scripts/ Reverted revisions 105888, 105915 and 105919. I would love to reapply

Log message for revision 106143:
  Reverted revisions 105888, 105915 and 105919. I would love to reapply
  105888 when there is an adequate test.  This can be achived through a
  pretty straightforward conversion of the existing manual repozo test
  to an automated test.
  

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

-=-
Modified: ZODB/branches/3.9/src/ZODB/scripts/repozo.py
===================================================================
--- ZODB/branches/3.9/src/ZODB/scripts/repozo.py	2009-12-01 19:09:54 UTC (rev 106142)
+++ ZODB/branches/3.9/src/ZODB/scripts/repozo.py	2009-12-01 20:00:06 UTC (rev 106143)
@@ -65,6 +65,7 @@
 
 import os
 import sys
+import md5
 import gzip
 import time
 import errno
@@ -81,12 +82,6 @@
 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
@@ -215,7 +210,7 @@
 
 def checksum(fp, n):
     # Checksum the first n bytes of the specified file
-    sum = md5()
+    sum = md5.new()
     def func(data):
         sum.update(data)
     dofile(func, fp, n)
@@ -226,7 +221,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()
+    sum = md5.new()
     ifp = open(options.file, 'rb')
     ifp.seek(start)
     tempname = os.path.join(os.path.dirname(dst), 'tmp.tmp')
@@ -253,7 +248,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()
+    sum = md5.new()
     def func(data):
         sum.update(data)
         if ofp:

Modified: ZODB/branches/3.9/src/ZODB/scripts/tests.py
===================================================================
--- ZODB/branches/3.9/src/ZODB/scripts/tests.py	2009-12-01 19:09:54 UTC (rev 106142)
+++ ZODB/branches/3.9/src/ZODB/scripts/tests.py	2009-12-01 20:00:06 UTC (rev 106143)
@@ -26,14 +26,8 @@
     (re.compile('hash=[0-9a-f]{40}'),
      'hash=b16422d09fabdb45d4e4325e4b42d7d6f021d3c3')])
 
-class RepozoTests(unittest.TestCase):
-
-    def test_importability(self):
-        from ZODB.scripts import repozo
-
 def test_suite():
     return unittest.TestSuite((
-        unittest.makeSuite(RepozoTests),
         doctest.DocFileSuite(
             'referrers.txt', 'fstail.txt',
             setUp=ZODB.tests.util.setUp, tearDown=ZODB.tests.util.tearDown,