From 1827249653a9d07fc355453c8133ced12c764588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Mon, 4 Mar 2019 13:49:03 +0100
Subject: [PATCH] Fix imports
transports_nb was renamed in nbxmpp
---
gajim/common/connection.py | 2 +-
gajim/common/zeroconf/client_zeroconf.py | 6 +++---
gajim/common/zeroconf/connection_zeroconf.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gajim/common/connection.py b/gajim/common/connection.py
index 735df0d6a4..9db930192a 100644
--- a/gajim/common/connection.py
+++ b/gajim/common/connection.py
@@ -1023,7 +1023,7 @@ class Connection(CommonConnection, ConnectionHandlers):
if self._proxy and self._proxy['type'] == 'bosh':
# with BOSH, we can't do TLS negotiation with <starttls>, we do only "plain"
# connection and TLS with handshake right after TCP connecting ("ssl")
- scheme = nbxmpp.transports_nb.urisplit(self._proxy['bosh_uri'])[0]
+ scheme = nbxmpp.transports.urisplit(self._proxy['bosh_uri'])[0]
if scheme == 'https':
connection_types = ['ssl']
else:
diff --git a/gajim/common/zeroconf/client_zeroconf.py b/gajim/common/zeroconf/client_zeroconf.py
index 945e079d86..ac74030473 100644
--- a/gajim/common/zeroconf/client_zeroconf.py
+++ b/gajim/common/zeroconf/client_zeroconf.py
@@ -31,9 +31,9 @@ from nbxmpp import simplexml
from nbxmpp.structs import StanzaHandler
from nbxmpp.plugin import PlugIn
from nbxmpp.idlequeue import IdleObject
-from nbxmpp.transports_nb import DATA_RECEIVED
-from nbxmpp.transports_nb import DATA_SENT
-from nbxmpp.transports_nb import DATA_ERROR
+from nbxmpp.transports import DATA_RECEIVED
+from nbxmpp.transports import DATA_SENT
+from nbxmpp.transports import DATA_ERROR
from gajim.common import app
from gajim.common.zeroconf import zeroconf
diff --git a/gajim/common/zeroconf/connection_zeroconf.py b/gajim/common/zeroconf/connection_zeroconf.py
index 70f02079ce..8a780740bd 100644
--- a/gajim/common/zeroconf/connection_zeroconf.py
+++ b/gajim/common/zeroconf/connection_zeroconf.py
@@ -465,7 +465,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf):
def _event_dispatcher(self, realm, event, data):
CommonConnection._event_dispatcher(self, realm, event, data)
if realm == '':
- if event == nbxmpp.transports_nb.DATA_ERROR:
+ if event == nbxmpp.transports.DATA_ERROR:
thread_id = data[1]
frm = data[0]
session = self.get_or_create_session(frm, thread_id)
--
GitLab