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
This commit is contained in:
Goffi 2019-08-13 19:08:41 +02:00
commit fbfe96c505

View file

@ -1,4 +1,4 @@
#!/usr/bin/env python2
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# SAT: a jabber client
@ -63,10 +63,10 @@ class PersistentDict(object):
return d
def iteritems(self):
return self._cache.iteritems()
return iter(self._cache.items())
def items(self):
return self._cache.items()
return list(self._cache.items())
def __repr__(self):
return self._cache.__repr__()
@ -98,8 +98,8 @@ class PersistentDict(object):
def __hash__(self):
return self._cache.__hash__()
def __nonzero__(self):
return self._cache.__len__()
def __bool__(self):
return self._cache.__len__() != 0
def __contains__(self, key):
return self._cache.__contains__(key)
@ -149,7 +149,7 @@ class PersistentBinaryDict(PersistentDict):
class LazyPersistentBinaryDict(PersistentBinaryDict):
ur"""PersistentBinaryDict which get key/value when needed
r"""PersistentBinaryDict which get key/value when needed
This Persistent need more database access, it is suitable for largest data,
to save memory.
@ -160,7 +160,7 @@ class LazyPersistentBinaryDict(PersistentBinaryDict):
def load(self):
# we show a warning as calling load on LazyPersistentBinaryDict sounds like a code mistake
log.warning(_(u"Calling load on LazyPersistentBinaryDict while it's not needed"))
log.warning(_("Calling load on LazyPersistentBinaryDict while it's not needed"))
def iteritems(self):
raise NotImplementedError
@ -196,9 +196,9 @@ class LazyPersistentBinaryDict(PersistentBinaryDict):
raise NotImplementedError
def __hash__(self):
return hash(unicode(self.__class__) + self.namespace + (self.profile or u''))
return hash(str(self.__class__) + self.namespace + (self.profile or ''))
def __nonzero__(self):
def __bool__(self):
raise NotImplementedError
def __contains__(self, key):