Mercurial > libervia-backend

comparison sat/plugins/plugin_xep_0092.py @ 3028:ab2696e34d29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
3027:ff5bcb12ae60 3028:ab2696e34d29
1 #!/usr/bin/env python2 1 #!/usr/bin/env python3
2 # -*- coding: utf-8 -*- 2 # -*- coding: utf-8 -*-
3 3
4 # SàT plugin for Software Version (XEP-0092) 4 # SàT plugin for Software Version (XEP-0092)
5 # Copyright (C) 2009-2019 Jérôme Poisson (goffi@goffi.org) 5 # Copyright (C) 2009-2019 Jérôme Poisson (goffi@goffi.org)
6 6
51 "getSoftwareVersion", 51 "getSoftwareVersion",
52 ".plugin", 52 ".plugin",
53 in_sign="ss", 53 in_sign="ss",
54 out_sign="(sss)", 54 out_sign="(sss)",
55 method=self._getVersion, 55 method=self._getVersion,
56 async=True, 56 async_=True,
57 ) 57 )
58 try: 58 try:
59 self.host.plugins[C.TEXT_CMDS].addWhoIsCb(self._whois, 50) 59 self.host.plugins[C.TEXT_CMDS].addWhoIsCb(self._whois, 50)
60 except KeyError: 60 except KeyError:
61 log.info(_("Text commands not available")) 61 log.info(_("Text commands not available"))
95 ) # XXX: timeout needed because some clients don't answer the IQ 95 ) # XXX: timeout needed because some clients don't answer the IQ
96 return d 96 return d
97 97
98 def _gotVersion(self, iq_elt): 98 def _gotVersion(self, iq_elt):
99 try: 99 try:
100 query_elt = iq_elt.elements(NS_VERSION, "query").next() 100 query_elt = next(iq_elt.elements(NS_VERSION, "query"))
101 except StopIteration: 101 except StopIteration:
102 raise exceptions.DataError 102 raise exceptions.DataError
103 ret = [] 103 ret = []
104 for name in ("name", "version", "os"): 104 for name in ("name", "version", "os"):
105 try: 105 try:
106 data_elt = query_elt.elements(NS_VERSION, name).next() 106 data_elt = next(query_elt.elements(NS_VERSION, name))
107 ret.append(unicode(data_elt)) 107 ret.append(str(data_elt))
108 except StopIteration: 108 except StopIteration:
109 ret.append(None) 109 ret.append(None)
110 110
111 return tuple(ret) 111 return tuple(ret)
112 112