Merge lp:~maxb/launchpad-cscvs/use-hashlib into lp:launchpad-cscvs

[Max Bowsher]

Use hashlib in place of md5 module, to avoid DeprecationWarnings.

Trivial migration from using md5 module to using hashlib module. The reason for doing this is to avoid DeprecationWarnings.

I realize cscvs is somewhat in deep maintenance mode, but it's actually easier to just fix these few DeprecationWarnings at the source, than to try to figure out how to reliably suppress them across the varied ways Launchpad processes are run.

[Jonathan Lange (jml)]

Looks fine to me. Would you like me to merge it for you?

review: Approve

[Max Bowsher (maxb)]

> Looks fine to me. Would you like me to merge it for you?

Yes please.

=== modified file 'modules/cscvs/dircompare/dirsums.py'
--- modules/cscvs/dircompare/dirsums.py	2007-05-08 08:29:23 +0000
+++ modules/cscvs/dircompare/dirsums.py	2010-04-14 01:53:16 +0000
@@ -15,7 +15,7 @@
 # This code was taken from hct.
 
 import os
-import md5
+import hashlib
 
 from cscvs.dircompare import tree
 
@@ -41,7 +41,7 @@
     else:
         f = open(path, "r")
         try:
-            return md5.new(f.read()).hexdigest()
+            return hashlib.md5(f.read()).hexdigest()
         finally:
             f.close()
 

=== modified file 'modules/cscvs/dircompare/path.py'
--- modules/cscvs/dircompare/path.py	2007-05-08 08:55:32 +0000
+++ modules/cscvs/dircompare/path.py	2010-04-14 01:53:16 +0000
@@ -15,7 +15,7 @@
 
 import os
 import re
-import md5
+import hashlib
 import stat
 import urlparse
 
@@ -258,7 +258,7 @@
     def md5sum(self):
         """Cache and return MD5 digest for path."""
         if self.isfile:
-            return md5.new(open(self).read()).hexdigest()
+            return hashlib.md5(open(self).read()).hexdigest()
         else:
             return None
 

=== modified file 'modules/cscvs/dircompare/tests/test_dirsums.py'
--- modules/cscvs/dircompare/tests/test_dirsums.py	2007-05-08 08:29:23 +0000
+++ modules/cscvs/dircompare/tests/test_dirsums.py	2010-04-14 01:53:16 +0000
@@ -10,7 +10,7 @@
 # These tests were taken from hct.
 
 import os
-import md5
+import hashlib
 
 from tests import TestUtil
 
@@ -33,7 +33,7 @@
         """file_sum returns correct MD5 of file."""
         from cscvs.dircompare.dirsums import file_sum
         self.assertEquals(file_sum(os.path.join(self.dir, "file")),
-                          md5.new(self.STR).hexdigest())
+                          hashlib.md5(self.STR).hexdigest())
 
     def testSymlink(self):
         """file_sum returns symlink destination instead of sum."""
@@ -102,8 +102,8 @@
         """calculate contains the right MD5 sum for files."""
         from cscvs.dircompare.dirsums import calculate
         sums = calculate(self.dir, source=["file", "dir/file"])
-        self.assertEquals(sums["file"], md5.new(self.STR1).hexdigest())
-        self.assertEquals(sums["dir/file"], md5.new(self.STR2).hexdigest())
+        self.assertEquals(sums["file"], hashlib.md5(self.STR1).hexdigest())
+        self.assertEquals(sums["dir/file"], hashlib.md5(self.STR2).hexdigest())
 
     def testInodes(self):
         """calculate contains the inode information for files."""

=== modified file 'modules/cscvs/dircompare/tests/test_path.py'
--- modules/cscvs/dircompare/tests/test_path.py	2008-09-15 17:33:30 +0000
+++ modules/cscvs/dircompare/tests/test_path.py	2010-04-14 01:53:16 +0000
@@ -344,9 +344,9 @@
         tmpfile = self.tempname()
         self.write("This is a file.\n", tmpfile)
         from cscvs.dircompare.path import Path
-        import md5
+        import hashlib
         self.assertEquals(Path(tmpfile).md5sum,
-                          md5.new(open(tmpfile).read()).hexdigest())
+                          hashlib.md5(open(tmpfile).read()).hexdigest())
 
     def testNotExist(self):
         """Path.md5sum returns None for a non-existant file."""