Mercurial > libervia-backend
diff sat/plugins/plugin_exp_jingle_stream.py @ 3028:ab2696e34d29
Python 3 port:
/!\ this is a huge commit
/!\ starting from this commit, SàT is needs Python 3.6+
/!\ SàT maybe be instable or some feature may not work anymore, this will improve with time
This patch port backend, bridge and frontends to Python 3.
Roughly this has been done this way:
- 2to3 tools has been applied (with python 3.7)
- all references to python2 have been replaced with python3 (notably shebangs)
- fixed files not handled by 2to3 (notably the shell script)
- several manual fixes
- fixed issues reported by Python 3 that where not handled in Python 2
- replaced "async" with "async_" when needed (it's a reserved word from Python 3.7)
- replaced zope's "implements" with @implementer decorator
- temporary hack to handle data pickled in database, as str or bytes may be returned,
to be checked later
- fixed hash comparison for password
- removed some code which is not needed anymore with Python 3
- deactivated some code which needs to be checked (notably certificate validation)
- tested with jp, fixed reported issues until some basic commands worked
- ported Primitivus (after porting dependencies like urwid satext)
- more manual fixes
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Tue, 13 Aug 2019 19:08:41 +0200 |
| parents | 003b8b4b56a7 |
| children | 9d0df638c8b4 |
line wrap: on
line diff
--- a/sat/plugins/plugin_exp_jingle_stream.py Wed Jul 31 11:31:22 2019 +0200 +++ b/sat/plugins/plugin_exp_jingle_stream.py Tue Aug 13 19:08:41 2019 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # SAT plugin for managing pipes (experimental) @@ -51,8 +51,8 @@ C.PI_DESCRIPTION: _("""Jingle Stream plugin"""), } -CONFIRM = D_(u"{peer} wants to send you a stream, do you accept ?") -CONFIRM_TITLE = D_(u"Stream Request") +CONFIRM = D_("{peer} wants to send you a stream, do you accept ?") +CONFIRM_TITLE = D_("Stream Request") class StreamProtocol(protocol.Protocol): @@ -119,7 +119,7 @@ def startStream(self, consumer): if self.consumer is not None: raise exceptions.InternalError( - _(u"stream can't be used with multiple consumers") + _("stream can't be used with multiple consumers") ) assert self.deferred is None self.consumer = consumer @@ -166,7 +166,7 @@ try: self.client_conn.sendData(data) except AttributeError: - log.warning(_(u"No client connected, can't send data")) + log.warning(_("No client connected, can't send data")) def writeToConsumer(self, data): self.consumer.write(data) @@ -186,7 +186,7 @@ in_sign="ss", out_sign="s", method=self._streamOut, - async=True, + async_=True, ) # jingle callbacks @@ -227,7 +227,7 @@ } ], ) - defer.returnValue(unicode(port)) + defer.returnValue(str(port)) def jingleSessionInit(self, client, session, content_name, stream_object): content_data = session["contents"][content_name] @@ -245,7 +245,7 @@ self._j.ROLE_INITIATOR, self._j.ROLE_RESPONDER, ): - log.warning(u"Bad sender, assuming initiator") + log.warning("Bad sender, assuming initiator") content_data["senders"] = self._j.ROLE_INITIATOR confirm_data = yield xml_tools.deferDialog( @@ -266,7 +266,7 @@ try: port = int(confirm_data["port"]) except (ValueError, KeyError): - raise exceptions.DataError(_(u"given port is invalid")) + raise exceptions.DataError(_("given port is invalid")) endpoint = endpoints.TCP4ClientEndpoint(reactor, "localhost", port) factory = StreamFactory() yield endpoint.connect(factory) @@ -288,16 +288,16 @@ args = [client, session, content_name, content_data] finished_d.addCallbacks(self._finishedCb, self._finishedEb, args, None, args) else: - log.warning(u"FIXME: unmanaged action {}".format(action)) + log.warning("FIXME: unmanaged action {}".format(action)) return desc_elt def _finishedCb(self, __, client, session, content_name, content_data): - log.info(u"Pipe transfer completed") + log.info("Pipe transfer completed") self._j.contentTerminate(client, session, content_name) content_data["stream_object"].stopStream() def _finishedEb(self, failure, client, session, content_name, content_data): - log.warning(u"Error while streaming pipe: {}".format(failure)) + log.warning("Error while streaming pipe: {}".format(failure)) self._j.contentTerminate( client, session, content_name, reason=self._j.REASON_FAILED_TRANSPORT )