diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-14 03:11:11 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 03:11:11 +1000 |
| commit | 7c27c4d51cfd2a3d6504889b1ccdddabf38ae05c (patch) | |
| tree | 1b3523ee1e3e68f0ab4ca66c160562252641da0b /synapse/push/mailer.py | |
| parent | Merge pull request #3856 from matrix-org/erikj/speed_up_purge (diff) | |
| download | synapse-7c27c4d51cfd2a3d6504889b1ccdddabf38ae05c.tar.xz | |
merge (#3576)
Diffstat (limited to 'synapse/push/mailer.py')
| -rw-r--r-- | synapse/push/mailer.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py index bfa6df7b68..b78ce10396 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -17,10 +17,11 @@ import email.mime.multipart import email.utils import logging import time -import urllib from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText +from six.moves import urllib + import bleach import jinja2 @@ -474,7 +475,7 @@ class Mailer(object): # XXX: make r0 once API is stable return "%s_matrix/client/unstable/pushers/remove?%s" % ( self.hs.config.public_baseurl, - urllib.urlencode(params), + urllib.parse.urlencode(params), ) @@ -561,7 +562,7 @@ def _create_mxc_to_http_filter(config): return "%s_matrix/media/v1/thumbnail/%s?%s%s" % ( config.public_baseurl, serverAndMediaId, - urllib.urlencode(params), + urllib.parse.urlencode(params), fragment or "", ) |