summaryrefslogtreecommitdiff
path: root/src/mailman/rest/lists.py
diff options
context:
space:
mode:
authorBarry Warsaw2016-01-06 22:43:04 -0500
committerBarry Warsaw2016-01-06 22:43:04 -0500
commita4bbc7c4fcea5596ab9f5a3d82983ddcf6d25909 (patch)
tree7604553e6005ab869dfb1fc0fb182069ae36c176 /src/mailman/rest/lists.py
parente4167544b41f065b29a27ef5f9e27283557185f2 (diff)
downloadmailman-a4bbc7c4fcea5596ab9f5a3d82983ddcf6d25909.tar.gz
mailman-a4bbc7c4fcea5596ab9f5a3d82983ddcf6d25909.tar.zst
mailman-a4bbc7c4fcea5596ab9f5a3d82983ddcf6d25909.zip
Diffstat (limited to 'src/mailman/rest/lists.py')
-rw-r--r--src/mailman/rest/lists.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/mailman/rest/lists.py b/src/mailman/rest/lists.py
index 70f100f25..a4d2da56a 100644
--- a/src/mailman/rest/lists.py
+++ b/src/mailman/rest/lists.py
@@ -47,7 +47,6 @@ from mailman.rest.members import AMember, MemberCollection
from mailman.rest.post_moderation import HeldMessages
from mailman.rest.sub_moderation import SubscriptionRequests
from mailman.rest.validator import Validator
-from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound
from zope.component import getUtility
@@ -152,14 +151,12 @@ class AList(_ListBase):
"""Return a single member representation."""
if self._mlist is None:
return NotFound(), []
- try:
- the_member = getUtility(ISubscriptionService).find_members(
- email, self._mlist.list_id, role).one()
- except NoResultFound:
+ members = getUtility(ISubscriptionService).find_members(
+ email, self._mlist.list_id, role)
+ if len(members) == 0:
return NotFound(), []
- except MultipleResultsFound:
- raise AssertionError('Too many matches')
- return AMember(request.context['api_version'], the_member.member_id)
+ assert len(members) == 1, 'Too many matches'
+ return AMember(request.context['api_version'], members[0].member_id)
@child(roster_matcher)
def roster(self, request, segments, role):