3 files changed, 9 insertions, 9 deletions

diff --git a/src/mailman/rest/tests/test_addresses.py b/src/mailman/rest/tests/test_addresses.py
index 29e09355e..4d427df9f 100644
--- a/src/mailman/rest/tests/test_addresses.py
+++ b/src/mailman/rest/tests/test_addresses.py
@@ -165,7 +165,7 @@ class TestAddresses(unittest.TestCase):
                      'email': 'anne@example.com',
                      })
         self.assertEqual(cm.exception.code, 400)
-        self.assertEqual(cm.exception.reason, 'Address already exists')
+        self.assertEqual(cm.exception.reason, b'Address already exists')
 
     def test_invalid_address_bad_request(self):
         # Trying to add an invalid address string returns 400.
@@ -177,7 +177,7 @@ class TestAddresses(unittest.TestCase):
                      'email': 'invalid_address_string'
                      })
         self.assertEqual(cm.exception.code, 400)
-        self.assertEqual(cm.exception.reason, 'Invalid email address')
+        self.assertEqual(cm.exception.reason, b'Invalid email address')
 
     def test_empty_address_bad_request(self):
         # The address is required.
@@ -188,7 +188,7 @@ class TestAddresses(unittest.TestCase):
                 'http://localhost:9001/3.0/users/anne@example.com/addresses',
                 {})
         self.assertEqual(cm.exception.code, 400)
-        self.assertEqual(cm.exception.reason, 'Missing parameters: email')
+        self.assertEqual(cm.exception.reason, b'Missing parameters: email')
 
     def test_get_addresses_of_missing_user(self):
         # There is no user associated with the given address.
diff --git a/src/mailman/rest/tests/test_membership.py b/src/mailman/rest/tests/test_membership.py
index 6b40fbb01..4beea9090 100644
--- a/src/mailman/rest/tests/test_membership.py
+++ b/src/mailman/rest/tests/test_membership.py
@@ -59,7 +59,7 @@ class TestMembership(unittest.TestCase):
                 'subscriber': 'nobody@example.com',
                 })
         self.assertEqual(cm.exception.code, 400)
-        self.assertEqual(cm.exception.msg, 'No such list')
+        self.assertEqual(cm.exception.reason, b'No such list')
 
     def test_try_to_leave_missing_list(self):
         # A user tries to leave a non-existent list.
@@ -99,7 +99,7 @@ class TestMembership(unittest.TestCase):
                 'subscriber': 'anne@example.com',
                 })
         self.assertEqual(cm.exception.code, 409)
-        self.assertEqual(cm.exception.msg, 'Member already subscribed')
+        self.assertEqual(cm.exception.reason, b'Member already subscribed')
 
     def test_join_with_invalid_delivery_mode(self):
         with self.assertRaises(HTTPError) as cm:
@@ -110,8 +110,8 @@ class TestMembership(unittest.TestCase):
                 'delivery_mode': 'invalid-mode',
                 })
         self.assertEqual(cm.exception.code, 400)
-        self.assertEqual(cm.exception.msg,
-                         'Cannot convert parameters: delivery_mode')
+        self.assertEqual(cm.exception.reason,
+                         b'Cannot convert parameters: delivery_mode')
 
     def test_join_email_contains_slash(self):
         content, response = call_api('http://localhost:9001/3.0/members', {
@@ -203,7 +203,7 @@ class TestMembership(unittest.TestCase):
                      'powers': 'super',
                      }, method='PATCH')
         self.assertEqual(cm.exception.code, 400)
-        self.assertEqual(cm.exception.msg, 'Unexpected parameters: powers')
+        self.assertEqual(cm.exception.reason, b'Unexpected parameters: powers')
 
     def test_member_all_without_preferences(self):
         # /members/<id>/all should return a 404 when it isn't trailed by
diff --git a/src/mailman/rest/validator.py b/src/mailman/rest/validator.py
index 74a8c0be4..c185c6694 100644
--- a/src/mailman/rest/validator.py
+++ b/src/mailman/rest/validator.py
@@ -62,7 +62,7 @@ def subscriber_validator(subscriber):
     try:
         return UUID(int=int(subscriber))
     except ValueError:
-        return subscriber.decode('utf-8')
+        return subscriber
 
 
 def language_validator(code):