summary refs log tree commit diff
path: root/synapse/crypto
diff options
context:
space:
mode:
authorJeroen <vo.jeroen@gmail.com>2018-08-09 21:31:26 +0200
committerJeroen <vo.jeroen@gmail.com>2018-08-09 21:31:26 +0200
commit2e9c73e8cab5af901957f5809f3be415d6fc0908 (patch)
tree224e2270d00758586fae1744c7fc5d6a9ed02046 /synapse/crypto
parentinclude private functions from twisted (diff)
downloadsynapse-2e9c73e8cab5af901957f5809f3be415d6fc0908.tar.xz
more generic conversion of str/bytes to unicode
Diffstat (limited to 'synapse/crypto')
-rw-r--r--synapse/crypto/context_factory.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/crypto/context_factory.py b/synapse/crypto/context_factory.py
index 08c41a92b6..1a391adec1 100644
--- a/synapse/crypto/context_factory.py
+++ b/synapse/crypto/context_factory.py
@@ -123,6 +123,6 @@ class ClientTLSOptionsFactory(object):
 
     def get_options(self, host):
         return ClientTLSOptions(
-            unicode(host),
+            host.decode('utf-8'),
             CertificateOptions(verify=False).getContext()
         )