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:
parent
d21a6a660f
commit
fbfe96c505
1 changed files with 6336 additions and 6398 deletions
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python2
|
||||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# SAT: a jabber client
|
||||
|
|
@ -29,7 +29,7 @@ from wokkel.disco import DiscoItem, DiscoItems
|
|||
# temporary until the changes are integrated to Wokkel
|
||||
from sat_tmp.wokkel.rsm import RSMResponse
|
||||
|
||||
from constants import Const as C
|
||||
from .constants import Const as C
|
||||
from sat.plugins import plugin_xep_0045
|
||||
from collections import OrderedDict
|
||||
|
||||
|
|
@ -52,7 +52,7 @@ class FakeMUCClient(object):
|
|||
roster = {}
|
||||
|
||||
# ask the other profiles to fill our roster
|
||||
for i in xrange(0, len(C.PROFILE)):
|
||||
for i in range(0, len(C.PROFILE)):
|
||||
other_profile = C.PROFILE[i]
|
||||
if other_profile == profile:
|
||||
continue
|
||||
|
|
@ -69,7 +69,7 @@ class FakeMUCClient(object):
|
|||
pass
|
||||
|
||||
# rename our nick if it already exists
|
||||
while nick in roster.keys():
|
||||
while nick in list(roster.keys()):
|
||||
if C.PROFILE_DICT[profile].userhost() == roster[nick].entity.userhost():
|
||||
break # same user with different resource --> same nickname
|
||||
nick = nick + "_"
|
||||
|
|
@ -79,7 +79,7 @@ class FakeMUCClient(object):
|
|||
self.joined_rooms[room_jid] = room
|
||||
|
||||
# fill the other rosters with the new entry
|
||||
for i in xrange(0, len(C.PROFILE)):
|
||||
for i in range(0, len(C.PROFILE)):
|
||||
other_profile = C.PROFILE[i]
|
||||
if other_profile == profile:
|
||||
continue
|
||||
|
|
@ -104,7 +104,7 @@ class FakeMUCClient(object):
|
|||
profile = self.host.memory.getProfileName(profile_key)
|
||||
room = self.joined_rooms[roomJID]
|
||||
# remove ourself from the other rosters
|
||||
for i in xrange(0, len(C.PROFILE)):
|
||||
for i in range(0, len(C.PROFILE)):
|
||||
other_profile = C.PROFILE[i]
|
||||
if other_profile == profile:
|
||||
continue
|
||||
|
|
@ -252,7 +252,7 @@ class FakeSatPubSubClient(object):
|
|||
return False
|
||||
|
||||
for item in items:
|
||||
item_obj = parseXml(item) if isinstance(item, unicode) else item
|
||||
item_obj = parseXml(item) if isinstance(item, str) else item
|
||||
if not replace(item_obj):
|
||||
node.append(item_obj)
|
||||
return defer.succeed(None)
|
||||
|
|
@ -296,6 +296,6 @@ class FakeSatPubSubClient(object):
|
|||
|
||||
def service_getDiscoItems(self, service, nodeIdentifier, profile_key=C.PROF_KEY_NONE):
|
||||
items = DiscoItems()
|
||||
for item in self.__items.keys():
|
||||
for item in list(self.__items.keys()):
|
||||
items.append(DiscoItem(service, item))
|
||||
return defer.succeed(items)
|
||||
|
|
|
|||
Loading…
Reference in a new issue