Mercurial > libervia-backend
diff sat/plugins/plugin_xep_0065.py @ 3040:fee60f17ebac
jp: jp asyncio port:
/!\ this commit is huge. Jp is temporarily not working with `dbus` bridge /!\
This patch implements the port of jp to asyncio, so it is now correctly using the bridge
asynchronously, and it can be used with bridges like `pb`. This also simplify the code,
notably for things which were previously implemented with many callbacks (like pagination
with RSM).
During the process, some behaviours have been modified/fixed, in jp and backends, check
diff for details.
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Wed, 25 Sep 2019 08:56:41 +0200 |
| parents | ab2696e34d29 |
| children | b64dd7c1496d |
line wrap: on
line diff
--- a/sat/plugins/plugin_xep_0065.py Wed Sep 25 08:53:38 2019 +0200 +++ b/sat/plugins/plugin_xep_0065.py Wed Sep 25 08:56:41 2019 +0200 @@ -175,17 +175,8 @@ class Candidate(object): - def __init__( - self, - host, - port, - type_, - priority, - jid_, - id_=None, - priority_local=False, - factory=None, - ): + def __init__(self, host, port, type_, priority, jid_, id_=None, priority_local=False, + factory=None,): """ @param host(unicode): host IP or domain @param port(int): port @@ -227,15 +218,6 @@ return self._priority def __str__(self): - # similar to __unicode__ but we don't show jid and we encode id - return "Candidate ({0.priority}): host={0.host} port={0.port} type={0.type}{id}".format( - self, - id=" id={}".format(self.id if self.id is not None else "").encode( - "utf-8", "ignore" - ), - ) - - def __unicode__(self): return "Candidate ({0.priority}): host={0.host} port={0.port} jid={0.jid} type={0.type}{id}".format( self, id=" id={}".format(self.id if self.id is not None else "") )