Merge pull request #4250 from matrix-org/hawkowl/pusher-remove-py3

Fix removing pushers on python 3
pull/4260/head
Richard van der Hoff 2018-12-04 11:22:46 +01:00 committed by GitHub
commit a077e710a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

1
changelog.d/4250.bugfix Normal file
View File

@ -0,0 +1 @@
Pushers can now be unsubscribed from on Python 3.

View File

@ -142,7 +142,7 @@ class PushersRemoveRestServlet(RestServlet):
To allow pusher to be delete by clicking a link (ie. GET request) To allow pusher to be delete by clicking a link (ie. GET request)
""" """
PATTERNS = client_path_patterns("/pushers/remove$") 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): def __init__(self, hs):
super(PushersRemoveRestServlet, self).__init__() super(PushersRemoveRestServlet, self).__init__()