From 95341a8f6f9c3b7ebcb3a428de65b18740234f3e Mon Sep 17 00:00:00 2001
From: Jeroen <vo.jeroen@gmail.com>
Date: Tue, 26 Jun 2018 21:15:14 +0200
Subject: take idna implementation from twisted

---
 synapse/crypto/context_factory.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'synapse/crypto/context_factory.py')

diff --git a/synapse/crypto/context_factory.py b/synapse/crypto/context_factory.py
index e93afbf975..57694e18b0 100644
--- a/synapse/crypto/context_factory.py
+++ b/synapse/crypto/context_factory.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 import logging
 
-import idna
 from OpenSSL import SSL, crypto
+from twisted.internet._idna import _idnaBytes
 from twisted.internet.ssl import ContextFactory, CertificateOptions
 from twisted.internet._sslverify import _defaultCurveName, _tolerateErrors
 from twisted.internet.interfaces import IOpenSSLClientConnectionCreator
@@ -63,7 +63,7 @@ class ClientTLSOptions(object):
     def __init__(self, hostname, ctx):
         self._ctx = ctx
         self._hostname = hostname
-        self._hostnameBytes = idna.encode(hostname)
+        self._hostnameBytes = _idnaBytes(hostname)
         ctx.set_info_callback(
             _tolerateErrors(self._identityVerifyingInfoCallback)
         )
-- 
cgit 1.4.1