summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBarry Warsaw2010-06-15 22:39:06 -0400
committerBarry Warsaw2010-06-15 22:39:06 -0400
commitafee5d048337b31e1db35dfd5eae7dc4695e3758 (patch)
tree7cfa9ff6d9bf71a7587d227049e526f0f341c4e6 /src
parent46025d7e8c72dd17bc258d90eb2a3dd2428ee03b (diff)
downloadmailman-afee5d048337b31e1db35dfd5eae7dc4695e3758.tar.gz
mailman-afee5d048337b31e1db35dfd5eae7dc4695e3758.tar.zst
mailman-afee5d048337b31e1db35dfd5eae7dc4695e3758.zip
Diffstat (limited to 'src')
-rw-r--r--src/mailman/rest/docs/membership.txt2
-rw-r--r--src/mailman/rest/members.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mailman/rest/docs/membership.txt b/src/mailman/rest/docs/membership.txt
index 70d4384ce..5867c0928 100644
--- a/src/mailman/rest/docs/membership.txt
+++ b/src/mailman/rest/docs/membership.txt
@@ -290,7 +290,7 @@ Anna tries to join a mailing list she's already a member of.
... })
Traceback (most recent call last):
...
- HTTPError: HTTP Error 400: Bad Request
+ HTTPError: HTTP Error 409: Conflict
Gwen tries to join the alpha mailing list using an invalid delivery mode.
diff --git a/src/mailman/rest/members.py b/src/mailman/rest/members.py
index a5a3dd02e..8c0593457 100644
--- a/src/mailman/rest/members.py
+++ b/src/mailman/rest/members.py
@@ -108,7 +108,7 @@ class AllMembers(_MemberBase):
_optional=('real_name', 'delivery_mode'))
member = service.join(**validator(request))
except AlreadySubscribedError:
- return http.bad_request([], b'Member already subscribed')
+ return http.conflict([], b'Member already subscribed')
except NoSuchListError:
return http.bad_request([], b'No such list')
except InvalidEmailAddressError: