diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-12-04 11:22:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-04 11:22:46 +0100 |
| commit | a077e710a34f4387e464679dcf2c911f34cd3b81 (patch) | |
| tree | 9a6bafd706adc968b221b88eb53a0ead9c97136d | |
| parent | Merge pull request #4257 from aaronraimist/add-editorconfig (diff) | |
| parent | changelog (diff) | |
| download | synapse-a077e710a34f4387e464679dcf2c911f34cd3b81.tar.xz | |
Merge pull request #4250 from matrix-org/hawkowl/pusher-remove-py3
Fix removing pushers on python 3
| -rw-r--r-- | changelog.d/4250.bugfix | 1 | ||||
| -rw-r--r-- | synapse/rest/client/v1/pusher.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/4250.bugfix b/changelog.d/4250.bugfix new file mode 100644 index 0000000000..1f60f5bd0a --- /dev/null +++ b/changelog.d/4250.bugfix @@ -0,0 +1 @@ +Pushers can now be unsubscribed from on Python 3. diff --git a/synapse/rest/client/v1/pusher.py b/synapse/rest/client/v1/pusher.py index b84f0260f2..4c07ae7f45 100644 --- a/synapse/rest/client/v1/pusher.py +++ b/synapse/rest/client/v1/pusher.py @@ -142,7 +142,7 @@ class PushersRemoveRestServlet(RestServlet): To allow pusher to be delete by clicking a link (ie. GET request) """ PATTERNS = client_path_patterns("/pushers/remove$") - SUCCESS_HTML = "<html><body>You have been unsubscribed</body><html>" + SUCCESS_HTML = b"<html><body>You have been unsubscribed</body><html>" def __init__(self, hs): super(PushersRemoveRestServlet, self).__init__() |