diff options
| author | Erik Johnston <erik@matrix.org> | 2018-09-19 15:08:36 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-09-19 15:08:36 +0100 |
| commit | ce846bb620e9866531f4a49f183fdd3cbb3f1eeb (patch) | |
| tree | ed38561118af50948598967e17ad6a7f1fee8a8c /synapse/rest/client/v1/pusher.py | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #3910 from matrix-org/erikj/update_timeout (diff) | |
| download | synapse-ce846bb620e9866531f4a49f183fdd3cbb3f1eeb.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing
Diffstat (limited to 'synapse/rest/client/v1/pusher.py')
| -rw-r--r-- | synapse/rest/client/v1/pusher.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/pusher.py b/synapse/rest/client/v1/pusher.py index 182a68b1e2..b84f0260f2 100644 --- a/synapse/rest/client/v1/pusher.py +++ b/synapse/rest/client/v1/pusher.py @@ -59,7 +59,7 @@ class PushersRestServlet(ClientV1RestServlet): ] for p in pushers: - for k, v in p.items(): + for k, v in list(p.items()): if k not in allowed_keys: del p[k] @@ -126,7 +126,7 @@ class PushersSetRestServlet(ClientV1RestServlet): profile_tag=content.get('profile_tag', ""), ) except PusherConfigException as pce: - raise SynapseError(400, "Config Error: " + pce.message, + raise SynapseError(400, "Config Error: " + str(pce), errcode=Codes.MISSING_PARAM) self.notifier.on_new_replication_data() |