From 94eef409db9ac5395e041de098faeee07093f413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Sun, 3 Mar 2019 19:40:39 +0100
Subject: [PATCH] Fix imports
dispatcher_nb was renamed in nbxmpp
---
gajim/common/connection.py | 2 +-
gajim/common/zeroconf/client_zeroconf.py | 4 ++--
test/broken/unit/test_jingle.py | 6 +++---
test/broken/unit/test_socks5.py | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gajim/common/connection.py b/gajim/common/connection.py
index 6c61013571..735df0d6a4 100644
--- a/gajim/common/connection.py
+++ b/gajim/common/connection.py
@@ -1071,7 +1071,7 @@ class Connection(CommonConnection, ConnectionHandlers):
con.set_resume_data(self._sm_resume_data)
# increase default timeout for server responses
- nbxmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = \
+ nbxmpp.dispatcher.DEFAULT_TIMEOUT_SECONDS = \
self.try_connecting_for_foo_secs
# FIXME: this is a hack; need a better way
if self.on_connect_success == self._on_new_account: # pylint: disable=comparison-with-callable
diff --git a/gajim/common/zeroconf/client_zeroconf.py b/gajim/common/zeroconf/client_zeroconf.py
index 889f6059fc..945e079d86 100644
--- a/gajim/common/zeroconf/client_zeroconf.py
+++ b/gajim/common/zeroconf/client_zeroconf.py
@@ -26,7 +26,7 @@ from random import Random
from unittest.mock import Mock
import nbxmpp
-from nbxmpp import dispatcher_nb
+from nbxmpp import dispatcher
from nbxmpp import simplexml
from nbxmpp.structs import StanzaHandler
from nbxmpp.plugin import PlugIn
@@ -231,7 +231,7 @@ class P2PClient(IdleObject):
def on_connect(self, conn):
self.Connection = conn
self.Connection.PlugIn(self)
- dispatcher_nb.Dispatcher().PlugIn(self)
+ dispatcher.Dispatcher().PlugIn(self)
self._register_handlers()
def StreamInit(self):
diff --git a/test/broken/unit/test_jingle.py b/test/broken/unit/test_jingle.py
index d63a076dec..1284b096b3 100644
--- a/test/broken/unit/test_jingle.py
+++ b/test/broken/unit/test_jingle.py
@@ -1,5 +1,5 @@
'''
-Tests for dispatcher_nb.py
+Tests for dispatcher.py
'''
import unittest
@@ -9,7 +9,7 @@ lib.setup_env()
from mock import Mock
from gajim.common.protocol.bytestream import ConnectionIBBytestream, ConnectionSocks5Bytestream
-from nbxmpp import dispatcher_nb
+from nbxmpp import dispatcher
from nbxmpp import protocol
from gajim.common.jingle import ConnectionJingle
from gajim.common import app
@@ -79,7 +79,7 @@ class Connection(Mock, ConnectionJingle, ConnectionSocks5Bytestream,
class TestJingle(unittest.TestCase):
def setUp(self):
- self.dispatcher = dispatcher_nb.XMPPDispatcher()
+ self.dispatcher = dispatcher.XMPPDispatcher()
app.nec = Mock()
app.socks5queue = SocksQueue(Mock())
# Setup mock client
diff --git a/test/broken/unit/test_socks5.py b/test/broken/unit/test_socks5.py
index 67d57ca97f..d329c6195e 100644
--- a/test/broken/unit/test_socks5.py
+++ b/test/broken/unit/test_socks5.py
@@ -1,5 +1,5 @@
'''
-Tests for dispatcher_nb.py
+Tests for dispatcher.py
'''
import unittest
--
GitLab