Philipp Hörist pushed to branch master at gajim / gajim

Commits:
18272496 by Philipp Hörist at 2019-03-04T12:49:03Z
Fix imports

transports_nb was renamed in nbxmpp
- - - - -


3 changed files:

- gajim/common/connection.py
- gajim/common/zeroconf/client_zeroconf.py
- gajim/common/zeroconf/connection_zeroconf.py


Changes:

=====================================
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:


=====================================
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


=====================================
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)



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/commit/1827249653a9d07fc355453c8133ced12c764588

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/commit/1827249653a9d07fc355453c8133ced12c764588
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits

Reply via email to