Merge lp:~maxb/launchpad/devel-10306-to-db-devel-resolve-conflict into lp:launchpad/db-devel

[Max Bowsher]

[Max Bowsher (maxb)]

I expect the next automatic merge from stable->db-devel to fail with a (trivial) conflict.

Here is the relevant merge with the conflict resolved.

[Guilherme Salgado (salgado)]

I think we should wait for the automatic merge to kick in (and fail), to make sure we don't merge any devel revisions not blessed by buildbot into db-devel.

[Abel Deuring (adeuring)]

A branch from noodles already resolved these conflicts in db-devel revision 8990

Unmerged revisions

8990. By Max Bowsher on 2010-02-12

Manual merge of devel r10306 to db-devel, resolving conflict.

=== modified file 'lib/canonical/base.py'
--- lib/canonical/base.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/base.py	2010-02-12 02:27:18 +0000
@@ -33,8 +33,8 @@
     This method is useful for shrinking sha1 and md5 hashes, but keeping
     them in simple ASCII suitable for URL's etc.
 
-    >>> import sha, md5
-    >>> s = sha.new('foo').hexdigest()
+    >>> import hashlib
+    >>> s = hashlib.sha1('foo').hexdigest()
     >>> s
     '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
     >>> i = long(s, 16)
@@ -42,7 +42,7 @@
     68123873083688143418383284816464454849230703155L
     >>> base(i, 62)
     '1HyPQr2xj1nmnkQXBCJXUdQoy5l'
-    >>> base(int(md5.new('foo').hexdigest(), 16), 62)
+    >>> base(int(hashlib.md5('foo').hexdigest(), 16), 62)
     '5fX649Stem9fET0lD46zVe'
 
     A sha1 hash can be compressed to 27 characters or less

=== modified file 'lib/canonical/buildd/slave.py'
--- lib/canonical/buildd/slave.py	2010-01-14 02:36:36 +0000
+++ lib/canonical/buildd/slave.py	2010-02-12 02:27:18 +0000
@@ -8,9 +8,9 @@
 
 __metaclass__ = type
 
+import hashlib
 import os
 import re
-import sha
 import urllib2
 import xmlrpclib
 
@@ -301,7 +301,7 @@
                 else:
                     of = open(self.cachePath(sha1sum), "w")
                     # Upped for great justice to 256k
-                    check_sum = sha.sha()
+                    check_sum = hashlib.sha1()
                     for chunk in iter(lambda: f.read(256*1024), ''):
                         of.write(chunk)
                         check_sum.update(chunk)
@@ -316,7 +316,7 @@
 
     def storeFile(self, content):
         """Take the provided content and store it in the file cache."""
-        sha1sum = sha.sha(content).hexdigest()
+        sha1sum = hashlib.sha1(content).hexdigest()
         present, info = self.ensurePresent(sha1sum)
         if present:
             return sha1sum

=== modified file 'lib/canonical/launchpad/database/emailaddress.py'
--- lib/canonical/launchpad/database/emailaddress.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/database/emailaddress.py	2010-02-12 02:27:18 +0000
@@ -11,8 +11,9 @@
     'UndeletableEmailAddress',
     ]
 
+
+import hashlib
 import operator
-import sha
 
 from zope.interface import implements
 
@@ -80,7 +81,7 @@
     @property
     def rdf_sha1(self):
         """See `IEmailAddress`."""
-        return sha.new('mailto:' + self.email).hexdigest().upper()
+        return hashlib.sha1('mailto:' + self.email).hexdigest().upper()
 
 
 class EmailAddressSet:

=== modified file 'lib/canonical/launchpad/database/temporaryblobstorage.py'
--- lib/canonical/launchpad/database/temporaryblobstorage.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/database/temporaryblobstorage.py	2010-02-12 02:27:18 +0000
@@ -10,13 +10,14 @@
     'TemporaryStorageManager',
     ]
 
-from cStringIO import StringIO
-from datetime import timedelta, datetime
+
 import random
-import sha
 import time
 import thread
 
+from cStringIO import StringIO
+from datetime import timedelta, datetime
+
 from pytz import utc
 from sqlobject import StringCol, ForeignKey
 from zope.component import getUtility

=== modified file 'lib/canonical/launchpad/helpers.py'
--- lib/canonical/launchpad/helpers.py	2009-12-10 13:20:12 +0000
+++ lib/canonical/launchpad/helpers.py	2010-02-12 02:27:18 +0000
@@ -10,16 +10,17 @@
 
 __metaclass__ = type
 
-import subprocess
+import hashlib
 import gettextpo
 import os
 import random
 import re
+import subprocess
 import tarfile
 import warnings
+
 from StringIO import StringIO
 from difflib import unified_diff
-import sha
 
 from zope.component import getUtility
 from zope.security.interfaces import ForbiddenAttribute
@@ -462,7 +463,7 @@
     """
     return '%s.msg' % (
             canonical.base.base(
-                long(sha.new(message_id).hexdigest(), 16), 62))
+                long(hashlib.sha1(message_id).hexdigest(), 16), 62))
 
 
 def intOrZero(value):

=== modified file 'lib/canonical/launchpad/mailman/monkeypatches/lphandler.py'
--- lib/canonical/launchpad/mailman/monkeypatches/lphandler.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/mailman/monkeypatches/lphandler.py	2010-02-12 02:27:18 +0000
@@ -3,7 +3,8 @@
 
 """A global pipeline handler for determining Launchpad membership."""
 
-import sha
+
+import hashlib
 import xmlrpclib
 
 from Mailman import Errors
@@ -24,7 +25,7 @@
     secret = msg['x-launchpad-hash']
     message_id = msg['message-id']
     if secret and message_id:
-        hash = sha.new(mm_cfg.LAUNCHPAD_SHARED_SECRET)
+        hash = hashlib.sha1(mm_cfg.LAUNCHPAD_SHARED_SECRET)
         hash.update(message_id)
         if secret == hash.hexdigest():
             # Since this message is coming from Launchpad, pre-approve it.

=== modified file 'lib/canonical/launchpad/scripts/logger.py'
--- lib/canonical/launchpad/scripts/logger.py	2009-10-16 18:07:01 +0000
+++ lib/canonical/launchpad/scripts/logger.py	2010-02-12 02:27:18 +0000
@@ -25,12 +25,14 @@
     'DEBUG6', 'DEBUG7', 'DEBUG8', 'DEBUG9'
     ]
 
+
+import hashlib
 import logging
 import re
-import sha
 import sys
 import traceback
 import time
+
 from optparse import OptionParser
 from cStringIO import StringIO
 from datetime import datetime, timedelta
@@ -168,7 +170,7 @@
         expiry = datetime.now().replace(tzinfo=utc) + timedelta(days=90)
         try:
             filename = base(
-                    long(sha.new(traceback).hexdigest(),16), 62
+                    long(hashlib.sha1(traceback).hexdigest(),16), 62
                     ) + '.txt'
             url = librarian.remoteAddFile(
                     filename, len(traceback), StringIO(traceback),

=== modified file 'lib/canonical/launchpad/webapp/authentication.py'
--- lib/canonical/launchpad/webapp/authentication.py	2009-10-20 22:13:21 +0000
+++ lib/canonical/launchpad/webapp/authentication.py	2010-02-12 02:27:18 +0000
@@ -14,8 +14,8 @@
 
 
 import binascii
+import hashlib
 import random
-import sha
 
 from contrib.oauth import OAuthRequest
 
@@ -178,7 +178,7 @@
         plaintext = str(plaintext)
         if salt is None:
             salt = self.generate_salt()
-        v = binascii.b2a_base64(sha.new(plaintext + salt).digest() + salt)
+        v = binascii.b2a_base64(hashlib.sha1(plaintext + salt).digest() + salt)
         return v[:-1]
 
     def validate(self, plaintext, encrypted):
@@ -191,7 +191,7 @@
             return False
         salt = ref[20:]
         v = binascii.b2a_base64(
-            sha.new(plaintext + salt).digest() + salt)[:-1]
+            hashlib.sha1(plaintext + salt).digest() + salt)[:-1]
         pw1 = (v or '').strip()
         pw2 = (encrypted or '').strip()
         return pw1 == pw2

=== modified file 'lib/canonical/launchpad/webapp/login.py'
--- lib/canonical/launchpad/webapp/login.py	2010-01-14 13:25:34 +0000
+++ lib/canonical/launchpad/webapp/login.py	2010-02-12 02:27:18 +0000
@@ -6,10 +6,11 @@
 __metaclass__ = type
 
 import cgi
+import hashlib
+import random
 import urllib
+
 from datetime import datetime, timedelta
-import md5
-import random
 
 from BeautifulSoup import UnicodeDammit
 
@@ -162,7 +163,7 @@
         expected = self.request.form.get(self.captcha_hash)
         submitted = self.request.form.get(self.captcha_submission)
         if expected is not None and submitted is not None:
-            return md5.new(submitted).hexdigest() == expected
+            return hashlib.md5(submitted).hexdigest() == expected
         return False
 
     @cachedproperty
@@ -182,7 +183,7 @@
 
         The hash is the value we put in the form for later comparison.
         """
-        return md5.new(str(self.captcha_answer)).hexdigest()
+        return hashlib.md5(str(self.captcha_answer)).hexdigest()
 
     @property
     def captcha_problem(self):

=== modified file 'lib/canonical/launchpad/webapp/tests/test_encryptor.py'
--- lib/canonical/launchpad/webapp/tests/test_encryptor.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/webapp/tests/test_encryptor.py	2010-02-12 02:27:18 +0000
@@ -3,15 +3,19 @@
 
 __metaclass__ = type
 
+
+import binascii
+import hashlib
 import unittest
-import sha
-import binascii
+
 from zope.component import getUtility
 from zope.app.testing import ztapi
 from zope.app.testing.placelesssetup import PlacelessSetup
+
 from canonical.launchpad.webapp.authentication import SSHADigestEncryptor
 from canonical.launchpad.interfaces import IPasswordEncryptor
 
+
 class TestSSHADigestEncryptor(PlacelessSetup, unittest.TestCase):
 
     def setUp(self):
@@ -26,7 +30,7 @@
         self.failIfEqual(encrypted1, encrypted2)
         salt = encrypted1[20:]
         v = binascii.b2a_base64(
-            sha.new('motorhead' + salt).digest() + salt
+            hashlib.sha1('motorhead' + salt).digest() + salt
             )[:-1]
         return (v == encrypted1)
 
@@ -41,8 +45,9 @@
         encrypted2 = encryptor.encrypt(u'motorhead')
         self.failIfEqual(encrypted1, encrypted2)
         salt = encrypted1[20:]
-        v = binascii.b2a_base64(sha.new('motorhead' + salt).digest() + salt)[:-1]
-        return (v == encrypted1)
+        v = binascii.b2a_base64(
+            hashlib.sha1('motorhead' + salt).digest() + salt)[:-1]
+        return v == encrypted1
 
     def test_unicode_validate(self):
         encryptor = getUtility(IPasswordEncryptor)

=== modified file 'lib/canonical/librarian/client.py'
--- lib/canonical/librarian/client.py	2010-01-11 18:06:23 +0000
+++ lib/canonical/librarian/client.py	2010-02-12 02:27:18 +0000
@@ -10,16 +10,17 @@
     'RestrictedLibrarianClient',
     ]
 
-import md5
+
+import hashlib
 import re
-import sha
 import socket
-from socket import SOCK_STREAM, AF_INET
-from select import select
 import time
 import threading
 import urllib
 import urllib2
+
+from select import select
+from socket import SOCK_STREAM, AF_INET
 from urlparse import urljoin
 
 from storm.store import Store
@@ -130,8 +131,8 @@
             self._sendLine('')
 
             # Prepare to the upload the file
-            shaDigester = sha.sha()
-            md5Digester = md5.md5()
+            shaDigester = hashlib.sha1()
+            md5Digester = hashlib.md5()
             bytesWritten = 0
 
             # Read in and upload the file 64kb at a time, by using the two-arg

=== modified file 'lib/canonical/librarian/ftests/test_storage.py'
--- lib/canonical/librarian/ftests/test_storage.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/librarian/ftests/test_storage.py	2010-02-12 02:27:18 +0000
@@ -1,7 +1,7 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-import sha
+import hashlib
 import shutil
 import tempfile
 import unittest
@@ -13,6 +13,7 @@
 from canonical.launchpad.database import LibraryFileContent, LibraryFileAlias
 from canonical.testing import LaunchpadZopelessLayer
 
+
 class LibrarianStorageDBTests(unittest.TestCase):
     layer = LaunchpadZopelessLayer
 
@@ -26,7 +27,7 @@
 
     def test_addFile(self):
         data = 'data ' * 50
-        digest = sha.sha(data).hexdigest()
+        digest = hashlib.sha1(data).hexdigest()
         newfile = self.storage.startAddFile('file1', len(data))
         newfile.srcDigest = digest
         newfile.append(data)
@@ -36,7 +37,7 @@
     def test_addFiles_identical(self):
         # Start adding two files with identical data
         data = 'data ' * 5000
-        digest = sha.sha(data).hexdigest()
+        digest = hashlib.sha1(data).hexdigest()
         newfile1 = self.storage.startAddFile('file1', len(data))
         newfile2 = self.storage.startAddFile('file2', len(data))
         newfile1.append(data)
@@ -63,7 +64,7 @@
     def test_alias(self):
         # Add a file (and so also add an alias)
         data = 'data ' * 50
-        digest = sha.sha(data).hexdigest()
+        digest = hashlib.sha1(data).hexdigest()
         newfile = self.storage.startAddFile('file1', len(data))
         newfile.mimetype = 'text/unknown'
         newfile.append(data)

=== modified file 'lib/canonical/librarian/storage.py'
--- lib/canonical/librarian/storage.py	2009-07-17 00:26:05 +0000
+++ lib/canonical/librarian/storage.py	2010-02-12 02:27:18 +0000
@@ -4,9 +4,8 @@
 __metaclass__ = type
 
 import os
-import md5
-import sha
 import errno
+import hashlib
 import shutil
 import tempfile
 
@@ -89,8 +88,8 @@
         tmpfile, tmpfilepath = tempfile.mkstemp(dir=self.storage.incoming)
         self.tmpfile = os.fdopen(tmpfile, 'w')
         self.tmpfilepath = tmpfilepath
-        self.shaDigester = sha.new()
-        self.md5Digester = md5.new()
+        self.shaDigester = hashlib.sha1()
+        self.md5Digester = hashlib.md5()
 
     def append(self, data):
         self.tmpfile.write(data)

=== modified file 'lib/canonical/librarian/tests/test_storage.py'
--- lib/canonical/librarian/tests/test_storage.py	2009-07-19 04:41:14 +0000
+++ lib/canonical/librarian/tests/test_storage.py	2010-02-12 02:27:18 +0000
@@ -2,7 +2,6 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 import os
-import sha
 import shutil
 import tempfile
 import unittest

=== modified file 'lib/canonical/librarian/utils.py'
--- lib/canonical/librarian/utils.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/librarian/utils.py	2010-02-12 02:27:18 +0000
@@ -2,7 +2,6 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
-
 __all__ = [
     'copy_and_close',
     'filechunks',
@@ -10,7 +9,8 @@
     'sha1_from_path',
     ]
 
-import sha
+
+import hashlib
 
 MEGABYTE = 1024*1024
 
@@ -39,7 +39,7 @@
 def sha1_from_path(path):
     """Return the hexdigest SHA1 for the contents of the path."""
     the_file = open(path)
-    the_hash = sha.new()
+    the_hash = hashlib.sha1()
 
     for chunk in filechunks(the_file):
         the_hash.update(chunk)

=== modified file 'lib/lp/archivepublisher/library.py'
--- lib/lp/archivepublisher/library.py	2009-06-24 23:28:16 +0000
+++ lib/lp/archivepublisher/library.py	2010-02-12 02:27:18 +0000
@@ -113,7 +113,9 @@
         return os.link(path, archive)
 
 if __name__ == '__main__':
-    import os, sys, sha
+    import hashlib
+    import os
+    import sys
 
     lib = Librarian('localhost', 9090, 8000, "/tmp/cache")
 
@@ -124,7 +126,7 @@
                                           lib.upload_port)
     fileobj = open(name, 'rb')
     size = os.stat(name).st_size
-    digest = sha.sha(open(name, 'rb').read()).hexdigest()
+    digest = hashlib.sha1(open(name, 'rb').read()).hexdigest()
 
     fileid, filealias = lib.addFile(name, size, fileobj,
                                     contentType='test/test',

=== modified file 'lib/lp/archivepublisher/publishing.py'
--- lib/lp/archivepublisher/publishing.py	2009-12-14 17:32:06 +0000
+++ lib/lp/archivepublisher/publishing.py	2010-02-12 02:27:18 +0000
@@ -9,12 +9,11 @@
 
 __metaclass__ = type
 
-import apt_pkg
-from datetime import datetime
+import hashlib
 import logging
-from md5 import md5
 import os
-from sha import sha
+
+from datetime import datetime
 
 from zope.component import getUtility
 
@@ -59,23 +58,6 @@
 Architecture: %s
 """
 
-class sha256:
-    """Encapsulates apt_pkg.sha256sum as expected by publishing.
-
-    It implements '__init__' and 'hexdigest' methods from PEP-247, which are
-    the only ones required in soyuz-publishing-system.
-
-    It's a work around for broken Crypto.Hash.SHA256. See further information
-    in bug #131503.
-    """
-    def __init__(self, content):
-        self._sum = apt_pkg.sha256sum(content)
-
-    def hexdigest(self):
-        """Return the hexdigest produced by apt_pkg.sha256sum."""
-        return self._sum
-
-
 def reorder_components(components):
     """Return a list of the components provided.
 
@@ -518,13 +500,13 @@
         f.write("MD5Sum:\n")
         all_files = sorted(list(all_files), key=os.path.dirname)
         for file_name in all_files:
-            self._writeSumLine(full_name, f, file_name, md5)
+            self._writeSumLine(full_name, f, file_name, hashlib.md5)
         f.write("SHA1:\n")
         for file_name in all_files:
-            self._writeSumLine(full_name, f, file_name, sha)
+            self._writeSumLine(full_name, f, file_name, hashlib.sha1)
         f.write("SHA256:\n")
         for file_name in all_files:
-            self._writeSumLine(full_name, f, file_name, sha256)
+            self._writeSumLine(full_name, f, file_name, hashlib.sha256)
 
         f.close()
 
@@ -607,16 +589,8 @@
 
         in_file = open(full_name, 'r')
         try:
-            # XXX cprov 20080704 bug=243630,269014: Workaround for hardy's
-            # python-apt. If it receives a file object as an argument instead
-            # of the file contents as a string, it will generate the correct
-            # SHA256.
-            if sum_form == sha256:
-                contents = in_file
-                length = os.stat(full_name).st_size
-            else:
-                contents = in_file.read()
-                length = len(contents)
+            contents = in_file.read()
+            length = len(contents)
             checksum = sum_form(contents).hexdigest()
         finally:
             in_file.close()

=== modified file 'lib/lp/archivepublisher/tests/test_librarianwrapper.py'
--- lib/lp/archivepublisher/tests/test_librarianwrapper.py	2009-06-24 23:28:16 +0000
+++ lib/lp/archivepublisher/tests/test_librarianwrapper.py	2010-02-12 02:27:18 +0000
@@ -5,9 +5,9 @@
 
 __metaclass__ = type
 
+import hashlib
 import os
 import shutil
-import sha
 import sys
 import unittest
 
@@ -47,7 +47,7 @@
 
         fileobj = open(path, 'rb')
         size = os.stat(path).st_size
-        digest = sha.sha(open(path, 'rb').read()).hexdigest()
+        digest = hashlib.sha1(open(path, 'rb').read()).hexdigest()
 
         ## Use Fake Librarian class
         uploader = FakeUploadClient()

=== modified file 'lib/lp/archivepublisher/tests/test_pool.py'
--- lib/lp/archivepublisher/tests/test_pool.py	2009-06-24 23:28:16 +0000
+++ lib/lp/archivepublisher/tests/test_pool.py	2010-02-12 02:27:18 +0000
@@ -5,13 +5,13 @@
 
 __metaclass__ = type
 
-
+import hashlib
 import os
-import sha
 import sys
 import shutil
+import unittest
+
 from tempfile import mkdtemp
-import unittest
 
 from lp.archivepublisher.tests.util import FakeLogger
 from lp.archivepublisher.diskpool import DiskPool, poolify
@@ -44,7 +44,7 @@
     def addToPool(self, component):
         return self.pool.addFile(
             component, self.sourcename, self.filename,
-            sha.sha(self.contents).hexdigest(), MockFile(self.contents))
+            hashlib.sha1(self.contents).hexdigest(), MockFile(self.contents))
 
     def removeFromPool(self, component):
         return self.pool.removeFile(component, self.sourcename, self.filename)

=== modified file 'lib/lp/archivepublisher/tests/test_publisher.py'
--- lib/lp/archivepublisher/tests/test_publisher.py	2009-12-21 18:05:27 +0000
+++ lib/lp/archivepublisher/tests/test_publisher.py	2010-02-12 02:27:18 +0000
@@ -8,6 +8,7 @@
 
 import bz2
 import gzip
+import hashlib
 import os
 import shutil
 import stat
@@ -20,8 +21,7 @@
 
 from lp.archivepublisher.config import getPubConfig
 from lp.archivepublisher.diskpool import DiskPool
-from lp.archivepublisher.publishing import (
-    Publisher, getPublisher, sha256)
+from lp.archivepublisher.publishing import Publisher, getPublisher
 from canonical.config import config
 from canonical.database.constants import UTC_NOW
 from canonical.launchpad.ftests.keys_for_tests import gpgkeysdir
@@ -745,70 +745,6 @@
                 self.assertReleaseFileRequested(
                     publisher, 'breezy-autotest', component, dist)
 
-    def testAptSHA256(self):
-        """Test issues with python-apt in Ubuntu/hardy.
-
-        This test only runs on Ubuntu/hardy systems.
-
-        The version of python-apt in Ubuntu/hardy has problems with
-        contents containing '\0' character.
-
-        The documented workaround for it is passing the original
-        file-descriptor to apt_pkg.sha256sum(), instead of its contents.
-
-        The python-apt version in Ubuntu/Intrepid has a fix for this issue,
-        but it already has many other features that makes a backport
-        practically unfeasible. That's mainly why this 'bug' is documented
-        as a LP test, the current code was modified to cope with it.
-
-        Once the issue with python-apt is gone, either by having a backport
-        available in hardy or a production upgrade, this test will fail. At
-        that point we will be able to revert the affected code and remove
-        this test, restoring the balance of the force.
-
-        See https://bugs.edge.launchpad.net/soyuz/+bug/243630 and
-        https://bugs.edge.launchpad.net/soyuz/+bug/269014.
-        """
-        # XXX cprov 20090218 bug-279248: when hardy's apt gets fixed by a
-        # SRU, this test will fail in PQM/Buildbot. Then we should change
-        # the actual code for passing file descriptors instead of text to
-        # apt (it will perform better this way) and obviously remove this
-        # test.
-
-        # Skip this test if it's not being run on Ubuntu/hardy.
-        lsb_info = get_lsb_information()
-        if (lsb_info.get('ID') != 'Ubuntu' or
-            lsb_info.get('CODENAME') != 'hardy'):
-            return
-
-        def _getSHA256(content):
-            """Return checksums for the given content.
-
-            Return a tuple containing the checksum corresponding to the
-            given content (as string) and a file containing the same string.
-            """
-            # Write the given content in a tempfile.
-            test_filepath = tempfile.mktemp()
-            test_file = open(test_filepath, 'w')
-            test_file.write(content)
-            test_file.close()
-            # Generate the checksums for the two sources.
-            text = sha256(content).hexdigest()
-            file = sha256(open(test_filepath)).hexdigest()
-            # Remove the tempfile.
-            os.unlink(test_filepath)
-            return text, file
-
-        # Apt does the right thing for ordinary strings, both, file and text
-        # checksums are identical.
-        text, file = _getSHA256("foobar")
-        self.assertEqual(text, file)
-
-        # On the other hand, there is a mismatch for strings containing '\0'
-        text, file = _getSHA256("foo\0bar")
-        self.assertNotEqual(
-            text, file, "Python-apt no longer creates bad SHA256 sums.")
-
     def _getReleaseFileOrigin(self, contents):
         origin_header = 'Origin: '
         [origin_line] = [

=== modified file 'lib/lp/archiveuploader/nascentuploadfile.py'
--- lib/lp/archiveuploader/nascentuploadfile.py	2009-12-14 13:49:03 +0000
+++ lib/lp/archiveuploader/nascentuploadfile.py	2010-02-12 02:27:18 +0000
@@ -21,9 +21,8 @@
 
 import apt_inst
 import apt_pkg
+import hashlib
 import os
-import md5
-import sha
 import subprocess
 import sys
 import time
@@ -214,8 +213,8 @@
 
         # Read in the file and compute its md5 and sha1 checksums and remember
         # the size of the file as read-in.
-        digest = md5.md5()
-        sha_cksum = sha.sha()
+        digest = hashlib.md5()
+        sha_cksum = hashlib.sha1()
         ckfile = open(self.filepath, "r")
         size = 0
         for chunk in filechunks(ckfile):

=== modified file 'lib/lp/services/mail/sendmail.py'
--- lib/lp/services/mail/sendmail.py	2010-02-09 01:31:05 +0000
+++ lib/lp/services/mail/sendmail.py	2010-02-12 02:27:18 +0000
@@ -22,10 +22,14 @@
     'simple_sendmail',
     'simple_sendmail_from_person',
     'raw_sendmail',
-    'validate_message']
+    'validate_message',
+    ]
+
+
+import hashlib
+import sets
 
 from binascii import b2a_qp
-import sha
 from email.Encoders import encode_base64
 from email.Utils import getaddresses, make_msgid, formatdate, formataddr
 from email.Message import Message
@@ -374,7 +378,7 @@
     # helps security, but still exposes us to a replay attack; we consider the
     # risk low.
     del message['X-Launchpad-Hash']
-    hash = sha.new(config.mailman.shared_secret)
+    hash = hashlib.sha1(config.mailman.shared_secret)
     hash.update(str(message['message-id']))
     message['X-Launchpad-Hash'] = hash.hexdigest()
 

=== modified file 'lib/lp/soyuz/doc/soyuz-upload.txt.disabled'
--- lib/lp/soyuz/doc/soyuz-upload.txt.disabled	2009-05-13 14:05:27 +0000
+++ lib/lp/soyuz/doc/soyuz-upload.txt.disabled	2010-02-12 02:27:18 +0000
@@ -144,9 +144,9 @@
 each FTP session. Below we ensure that, and also that the content
 of these files match the uploaded ones.
 
-  >>> import md5
+  >>> import hashlib
   >>> def get_md5(filename):
-  ...     return md5.new(open(filename).read()).digest()
+  ...     return hashlib.md5(open(filename).read()).digest()
 
   >>> def get_upload_dir(num, dir=incoming_dir):
   ...     """Return the path to the upload, if found in the dir."""

=== modified file 'lib/lp/soyuz/scripts/ftpmaster.py'
--- lib/lp/soyuz/scripts/ftpmaster.py	2009-12-13 11:55:40 +0000
+++ lib/lp/soyuz/scripts/ftpmaster.py	2010-02-12 02:27:18 +0000
@@ -21,7 +21,7 @@
 
 import apt_pkg
 import commands
-import md5
+import hashlib
 import os
 import stat
 import sys
@@ -836,7 +836,7 @@
     @classmethod
     def generateMD5Sum(self, filename):
         file_handle = open(filename)
-        md5sum = md5.md5(file_handle.read()).hexdigest()
+        md5sum = hashlib.md5(file_handle.read()).hexdigest()
         file_handle.close()
         return md5sum
 

=== modified file 'lib/lp/soyuz/scripts/gina/library.py'
--- lib/lp/soyuz/scripts/gina/library.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/scripts/gina/library.py	2010-02-12 02:27:18 +0000
@@ -5,12 +5,15 @@
 
 __metaclass__ = type
 
+
+import hashlib
 import os
-import sha
 
 from zope.component import getUtility
 
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
+
+
 def _libType(fname):
     if fname.endswith(".dsc"):
         return "text/x-debian-source-package"
@@ -41,7 +44,7 @@
 def checkLibraryForFile(path, filename):
     fullpath = os.path.join(path, filename)
     assert os.path.exists(fullpath)
-    digester = sha.sha()
+    digester = hashlib.sha1()
     openfile = open(fullpath, "r")
     for chunk in iter(lambda: openfile.read(1024*4), ''):
         digester.update(chunk)

=== modified file 'lib/lp/soyuz/scripts/queue.py'
--- lib/lp/soyuz/scripts/queue.py	2009-08-28 06:39:38 +0000
+++ lib/lp/soyuz/scripts/queue.py	2010-02-12 02:27:18 +0000
@@ -9,7 +9,6 @@
 # as Launchpad contains lots of queues.
 
 __metaclass__ = type
-
 __all__ = [
     'CommandRunner',
     'CommandRunnerError',
@@ -17,11 +16,12 @@
     'name_queue_map'
     ]
 
+
 import errno
+import hashlib
 import pytz
 
 from datetime import datetime
-from sha import sha
 
 from zope.component import getUtility
 
@@ -420,7 +420,7 @@
                     libfile.close()
                 else:
                     # Check sha against existing file (bug #67014)
-                    existing_sha = sha()
+                    existing_sha = hashlib.sha1()
                     for chunk in filechunks(existing_file):
                         existing_sha.update(chunk)
                     existing_file.close()

=== modified file 'lib/lp/soyuz/scripts/tests/test_queue.py'
--- lib/lp/soyuz/scripts/tests/test_queue.py	2009-12-13 11:55:40 +0000
+++ lib/lp/soyuz/scripts/tests/test_queue.py	2010-02-12 02:27:18 +0000
@@ -4,14 +4,17 @@
 """queue tool base class tests."""
 
 __metaclass__ = type
-
-__all__ = ['upload_bar_source']
-
+__all__ = [
+    'upload_bar_source',
+    ]
+
+
+import hashlib
 import os
 import shutil
 import tempfile
+
 from unittest import TestCase, TestLoader
-from sha import sha
 
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
@@ -929,7 +932,7 @@
 
     def _getsha1(self, filename):
         """Return a sha1 hex digest of a file"""
-        file_sha = sha()
+        file_sha = hashlib.sha1()
         opened_file = open(filename,"r")
         for chunk in filechunks(opened_file):
             file_sha.update(chunk)