Mark Sapiro pushed to branch master at GNU Mailman / Mailman Core
Commits:
080d8802 by Shubhank Saxena at 2021-03-17T05:21:52+00:00
Add better error message for preferred email edit when not verified
Signed-off-by: Shubhank Saxena <saxena.shubhank...@gmail.com>
- - - - -
7b4160c3 by Mark Sapiro at 2021-03-17T17:50:10+00:00
Merge branch 'shubhank/set-email-improved-error' into 'master'
Add better error message for preferred email edit when not verified
Closes #706
See merge request mailman/mailman!797
- - - - -
4 changed files:
- src/mailman/docs/NEWS.rst
- src/mailman/model/tests/test_user.py
- src/mailman/model/user.py
- src/mailman/rest/docs/addresses.rst
Changes:
=====================================
src/mailman/docs/NEWS.rst
=====================================
@@ -49,6 +49,7 @@ New Features
Other
-----
+* Add better error message for preferred email edit when not verified. (Closes
#706)
* Reduce the number of database calls in UserManager. (Closes #700)
.. _news-3.3.3:
=====================================
src/mailman/model/tests/test_user.py
=====================================
@@ -105,7 +105,9 @@ class TestUser(unittest.TestCase):
'anne.per...@example.com')
with self.assertRaises(UnverifiedAddressError) as cm:
self._anne.preferred_address = new_preferred
- self.assertEqual(cm.exception.address, new_preferred)
+ self.assertEqual(cm.exception.address,
+ "{} must be verified before setting as primary"
+ .format(new_preferred))
def test_preferences_deletion_on_user_deletion(self):
# LP: #1418276 - deleting a user did not delete their preferences.
=====================================
src/mailman/model/user.py
=====================================
@@ -132,7 +132,9 @@ class User(Model):
def preferred_address(self, address):
"""See `IUser`."""
if address.verified_on is None:
- raise UnverifiedAddressError(address)
+ raise UnverifiedAddressError(
+ "{} must be verified before setting as primary".format(address)
+ )
if self.controls(address.email):
# This user already controls the email address.
pass
=====================================
src/mailman/rest/docs/addresses.rst
=====================================
@@ -406,7 +406,7 @@ Setting Ram's preferred addresses requires that it first be
verified:
... {'email': 'r...@example.com'})
Traceback (most recent call last):
...
- urllib.error.HTTPError: HTTP Error 400: Ram Person <r...@example.com>
+ urllib.error.HTTPError: HTTP Error 400: Ram Person <r...@example.com> must
be verified before setting as primary
Verify Ram's address first:
::
View it on GitLab:
https://gitlab.com/mailman/mailman/-/compare/58654b3111312dfc00e646f10e1f255bd85e7ffc...7b4160c302aa71f765a05965cfbc6a977519a772
--
View it on GitLab:
https://gitlab.com/mailman/mailman/-/compare/58654b3111312dfc00e646f10e1f255bd85e7ffc...7b4160c302aa71f765a05965cfbc6a977519a772
You're receiving this email because of your account on gitlab.com.
_______________________________________________
Mailman-checkins mailing list -- mailman-checkins@python.org
To unsubscribe send an email to mailman-checkins-le...@python.org
https://mail.python.org/mailman3/lists/mailman-checkins.python.org/
Member address: arch...@jab.org
