tests: fix Python 2 -> 3 portability issues in test suite

- TestBase.py: fix `raise (exception, value)` tuple syntax -> `raise exception(value)`;
  drop dead Python 2.1 fallback branch for ndiffAssertEqual
- test_handlers.py, test_security_mgr.py: encode plaintext before hashing —
  Python 3 hashlib requires bytes, not str
- test_security_mgr.py: use b'...' literals for md5_new() calls
- test_safedict.py: dict.items() returns a view in Python 3, use sorted()
- test_bounces.py: fix relative path 'tests/bounces/' -> 'bounces/' since
  the test suite runs from within the tests/ directory

Author: thegushi

tests/TestBase.py

@@ -32,20 +32,15 @@
 
 
 class TestBase(unittest.TestCase):
-    if hasattr(difflib, 'ndiff'):
-        # Python 2.2 and beyond
-        def ndiffAssertEqual(self, first, second):
-            """Like failUnlessEqual except use ndiff for readable output."""
-            if first != second:
-                sfirst = str(first)
-                ssecond = str(second)
-                diff = difflib.ndiff(sfirst.splitlines(), ssecond.splitlines())
-                fp = StringIO()
-                print(NL, NL.join(diff), file=fp)
-                raise (self.failureException, fp.getvalue())
-    else:
-        # Python 2.1
-        ndiffAssertEqual = unittest.TestCase.assertEqual
+    def ndiffAssertEqual(self, first, second):
+        """Like failUnlessEqual except use ndiff for readable output."""
+        if first != second:
+            sfirst = str(first)
+            ssecond = str(second)
+            diff = difflib.ndiff(sfirst.splitlines(), ssecond.splitlines())
+            fp = StringIO()
+            print(NL, NL.join(diff), file=fp)
+            raise self.failureException(fp.getvalue())
 
     def setUp(self):
         mlist = MailList.MailList()

tests/test_bounces.py

@@ -192,7 +192,7 @@ def test_bounce(self):
         for modname, file, addrs in self.DATA:
             module = 'Mailman.Bouncers.' + modname
             __import__(module)
-            fp = open(os.path.join('tests', 'bounces', file))
+            fp = open(os.path.join('bounces', file))
             try:
                 msg = email.message_from_file(fp)
             finally:
@@ -212,7 +212,7 @@ def test_bounce(self):
     def test_SMTP32_failure(self):
         from Mailman.Bouncers import SMTP32
         # This file has no X-Mailer: header
-        fp = open(os.path.join('tests', 'bounces', 'postfix_01.txt'))
+        fp = open(os.path.join('bounces', 'postfix_01.txt'))
         try:
             msg = email.message_from_file(fp)
         finally:

tests/test_handlers.py

@@ -66,7 +66,7 @@
 
 
 def password(plaintext):
-    return sha_new(plaintext).hexdigest()
+    return sha_new(plaintext.encode()).hexdigest()
 
 
 

tests/test_safedict.py

@@ -84,8 +84,7 @@ def test_allmsg_no_key(self):
     def test_copy(self):
         sd = SafeDict.MsgSafeDict(self._msg, {'foo': 'bar'})
         copy = sd.copy()
-        items = copy.items()
-        items.sort()
+        items = sorted(copy.items())
         self.assertEqual(items, [
             ('allmsg_cc', 'aperson@dom.ain, bperson@dom.ain'),
             ('foo', 'bar'),

tests/test_security_mgr.py

@@ -44,7 +44,7 @@
 
 
 def password(plaintext):
-    return sha_new(plaintext).hexdigest()
+    return sha_new(plaintext.encode()).hexdigest()
 
 
 
@@ -137,7 +137,7 @@ def test_list_admin_unauth(self):
     def test_list_admin_upgrade(self):
         eq = self.assertEqual
         mlist = self._mlist
-        mlist.password = md5_new('ssSSss').digest()
+        mlist.password = md5_new(b'ssSSss').digest()
         eq(mlist.Authenticate(
             [mm_cfg.AuthListAdmin], 'ssSSss'), mm_cfg.AuthListAdmin)
         eq(mlist.password, password('ssSSss'))
@@ -151,10 +151,10 @@ def test_list_admin_upgrade(self):
     def test_list_admin_oldstyle_unauth(self):
         eq = self.assertEqual
         mlist = self._mlist
-        mlist.password = md5_new('ssSSss').digest()
+        mlist.password = md5_new(b'ssSSss').digest()
         eq(mlist.Authenticate(
             [mm_cfg.AuthListAdmin], 'xxxxxx'), mm_cfg.UnAuthorized)
-        eq(mlist.password, md5_new('ssSSss').digest())
+        eq(mlist.password, md5_new(b'ssSSss').digest())
         # Test crypt upgrades if crypt is supported
         if crypt:
             mlist.password = crypted = crypt.crypt('rrRRrr', 'zc')