Mercurial > libervia-backend
comparison sat_frontends/tools/jid.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 |
comparison
equal
deleted
inserted
replaced
| 3027:ff5bcb12ae60 | 3028:ab2696e34d29 |
|---|---|
| 18 # along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 # along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 19 | 19 |
| 20 | 20 |
| 21 # hack to use this module with pyjamas | 21 # hack to use this module with pyjamas |
| 22 try: | 22 try: |
| 23 unicode("") # XXX: unicode doesn't exist in pyjamas | 23 str("") # XXX: unicode doesn't exist in pyjamas |
| 24 | 24 |
| 25 # normal version | 25 # normal version |
| 26 class BaseJID(unicode): | 26 class BaseJID(str): |
| 27 def __new__(cls, jid_str): | 27 def __new__(cls, jid_str): |
| 28 self = unicode.__new__(cls, cls._normalize(jid_str)) | 28 self = str.__new__(cls, cls._normalize(jid_str)) |
| 29 return self | 29 return self |
| 30 | 30 |
| 31 def __init__(self, jid_str): | 31 def __init__(self, jid_str): |
| 32 pass | 32 pass |
| 33 | 33 |
| 112 | 112 |
| 113 @property | 113 @property |
| 114 def bare(self): | 114 def bare(self): |
| 115 if not self.node: | 115 if not self.node: |
| 116 return JID(self.domain) | 116 return JID(self.domain) |
| 117 return JID(u"{}@{}".format(self.node, self.domain)) | 117 return JID("{}@{}".format(self.node, self.domain)) |
| 118 | 118 |
| 119 def is_valid(self): | 119 def is_valid(self): |
| 120 """ | 120 """ |
| 121 @return: True if the JID is XMPP compliant | 121 @return: True if the JID is XMPP compliant |
| 122 """ | 122 """ |
| 129 | 129 |
| 130 @param entity (JID): original JID | 130 @param entity (JID): original JID |
| 131 @param resource (unicode): new resource | 131 @param resource (unicode): new resource |
| 132 @return: a new JID instance | 132 @return: a new JID instance |
| 133 """ | 133 """ |
| 134 return JID(u"%s/%s" % (entity.bare, resource)) | 134 return JID("%s/%s" % (entity.bare, resource)) |