From 187dad97bf278b0ca9d080774072e8fb235154cc Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Wed, 13 Jan 2016 12:20:40 -0500
Subject: Just a little more UUID conversion convenience.

---
 src/mailman/rest/members.py | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'src/mailman/rest')

diff --git a/src/mailman/rest/members.py b/src/mailman/rest/members.py
index bb0c8b834..517e55344 100644
--- a/src/mailman/rest/members.py
+++ b/src/mailman/rest/members.py
@@ -111,18 +111,12 @@ class AMember(_MemberBase):
         # The member_id is either the member's UUID or the string
         # representation of the member's UUID.
         self.api = api
-        self._member = None
         service = getUtility(ISubscriptionService)
-        if isinstance(member_id, UUID):
-            self._member = service.get_member(member_id)
-        else:
-            try:
-                member_id = api.to_uuid(member_id)
-            except ValueError:
-                # The string argument could not be converted to a UUID.
-                pass
-            else:
-                self._member = service.get_member(member_id)
+        try:
+            self._member = service.get_member(api.to_uuid(member_id))
+        except ValueError:
+            # The string argument could not be converted to a UUID.
+            self._member = None
 
     def on_get(self, request, response):
         """Return a single member end-point."""
-- 
cgit v1.2.3-70-g09d2