diff options
| author | Barry Warsaw | 2014-08-15 12:17:03 -0400 |
|---|---|---|
| committer | Barry Warsaw | 2014-08-15 12:17:03 -0400 |
| commit | 93cd9c35698032d8df8d744862bd7b1f95092a0c (patch) | |
| tree | a93ae53c7a1e9071d7530fde9cb090346364ae5e | |
| parent | 0afbc268937456769714971a7f1f00141d21f223 (diff) | |
| download | mailman-93cd9c35698032d8df8d744862bd7b1f95092a0c.tar.gz mailman-93cd9c35698032d8df8d744862bd7b1f95092a0c.tar.zst mailman-93cd9c35698032d8df8d744862bd7b1f95092a0c.zip | |
| -rw-r--r-- | src/mailman/rest/addresses.py | 4 | ||||
| -rw-r--r-- | src/mailman/rest/configuration.py | 11 | ||||
| -rw-r--r-- | src/mailman/rest/users.py | 3 |
3 files changed, 7 insertions, 11 deletions
diff --git a/src/mailman/rest/addresses.py b/src/mailman/rest/addresses.py index 475f0699d..fa3d099b6 100644 --- a/src/mailman/rest/addresses.py +++ b/src/mailman/rest/addresses.py @@ -192,9 +192,9 @@ class UserAddresses(_AddressBase): try: address = user_manager.create_address(**validator(request)) except ValueError as error: - bad_request(response, body=str(error)) + bad_request(response, str(error)) except InvalidEmailAddressError: - bad_request(response, body=b'Invalid email address') + bad_request(response, b'Invalid email address') except ExistingAddressError: bad_request(response, b'Address already exists') else: diff --git a/src/mailman/rest/configuration.py b/src/mailman/rest/configuration.py index 1e05ce8c0..7f94de39e 100644 --- a/src/mailman/rest/configuration.py +++ b/src/mailman/rest/configuration.py @@ -172,8 +172,7 @@ class ListConfiguration: resource[attribute] = value elif self._attribute not in ATTRIBUTES: bad_request( - response, - body=b'Unknown attribute: {0}'.format(self._attribute)) + response, b'Unknown attribute: {0}'.format(self._attribute)) return else: attribute = self._attribute @@ -189,7 +188,7 @@ class ListConfiguration: try: validator.update(self._mlist, request) except ValueError as error: - bad_request(response, body=str(error)) + bad_request(response, str(error)) return elif attribute not in ATTRIBUTES: bad_request(response, b'Unknown attribute: {0}'.format(attribute)) @@ -213,13 +212,11 @@ class ListConfiguration: validator = PatchValidator(request, ATTRIBUTES) except UnknownPATCHRequestError as error: bad_request( - response, - body=b'Unknown attribute: {0}'.format(error.attribute)) + response, b'Unknown attribute: {0}'.format(error.attribute)) return except ReadOnlyPATCHRequestError as error: bad_request( - response, - body=b'Read-only attribute: {0}'.format(error.attribute)) + response, b'Read-only attribute: {0}'.format(error.attribute)) return try: validator.update(self._mlist, request) diff --git a/src/mailman/rest/users.py b/src/mailman/rest/users.py index 645b83a36..798fe699d 100644 --- a/src/mailman/rest/users.py +++ b/src/mailman/rest/users.py @@ -120,8 +120,7 @@ class AllUsers(_UserBase): user = getUtility(IUserManager).create_user(**arguments) except ExistingAddressError as error: bad_request( - response, - body=b'Address already exists: {0}'.format(error.address)) + response, b'Address already exists: {0}'.format(error.address)) return if password is None: # This will have to be reset since it cannot be retrieved. |