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
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
|
||||
|
|
@ -25,12 +25,12 @@ from sat.tools.common import data_format
|
|||
try:
|
||||
from jinja2 import Markup as safe
|
||||
except ImportError:
|
||||
safe = unicode
|
||||
safe = str
|
||||
|
||||
from sat.tools.common import uri as xmpp_uri
|
||||
import urllib
|
||||
import urllib.request, urllib.parse, urllib.error
|
||||
|
||||
q = lambda value: urllib.quote(value.encode("utf-8"), safe="@")
|
||||
q = lambda value: urllib.parse.quote(value.encode("utf-8"), safe="@")
|
||||
|
||||
|
||||
def parsePubSubMetadata(metadata, items):
|
||||
|
|
@ -49,25 +49,25 @@ def parsePubSubMetadata(metadata, items):
|
|||
data = {}
|
||||
assert "complete" not in metadata
|
||||
|
||||
for key, value in metadata.iteritems():
|
||||
if key in (u"rsm_index", u"rsm_count"):
|
||||
for key, value in metadata.items():
|
||||
if key in ("rsm_index", "rsm_count"):
|
||||
value = int(value)
|
||||
elif key == u"mam_stable":
|
||||
elif key == "mam_stable":
|
||||
value = C.bool(value)
|
||||
elif key == u"mam_complete":
|
||||
key = u"complete"
|
||||
elif key == "mam_complete":
|
||||
key = "complete"
|
||||
value = C.bool(value)
|
||||
data[key] = value
|
||||
if u"complete" not in data:
|
||||
index = data.get(u"rsm_index")
|
||||
count = data.get(u"rsm_count")
|
||||
if "complete" not in data:
|
||||
index = data.get("rsm_index")
|
||||
count = data.get("rsm_count")
|
||||
if index is None or count is None:
|
||||
# we don't have enough information to know if the data is complete or not
|
||||
data[u"complete"] = None
|
||||
data["complete"] = None
|
||||
else:
|
||||
# normally we have a strict equality here but XEP-0059 states
|
||||
# that index MAY be approximative, so just in case…
|
||||
data[u"complete"] = index + len(items) >= count
|
||||
data["complete"] = index + len(items) >= count
|
||||
return data
|
||||
|
||||
|
||||
|
|
@ -88,75 +88,75 @@ class BlogItem(object):
|
|||
|
||||
@property
|
||||
def id(self):
|
||||
return self.mb_data.get(u"id")
|
||||
return self.mb_data.get("id")
|
||||
|
||||
@property
|
||||
def atom_id(self):
|
||||
return self.mb_data.get(u"atom_id")
|
||||
return self.mb_data.get("atom_id")
|
||||
|
||||
@property
|
||||
def uri(self):
|
||||
node = self.parent.node
|
||||
service = self.parent.service
|
||||
return xmpp_uri.buildXMPPUri(
|
||||
u"pubsub", subtype=u"microblog", path=service, node=node, item=self.id
|
||||
"pubsub", subtype="microblog", path=service, node=node, item=self.id
|
||||
)
|
||||
|
||||
@property
|
||||
def published(self):
|
||||
return self.mb_data.get(u"published")
|
||||
return self.mb_data.get("published")
|
||||
|
||||
@property
|
||||
def updated(self):
|
||||
return self.mb_data.get(u"updated")
|
||||
return self.mb_data.get("updated")
|
||||
|
||||
@property
|
||||
def language(self):
|
||||
return self.mb_data.get(u"language")
|
||||
return self.mb_data.get("language")
|
||||
|
||||
@property
|
||||
def author(self):
|
||||
return self.mb_data.get(u"author")
|
||||
return self.mb_data.get("author")
|
||||
|
||||
@property
|
||||
def author_jid(self):
|
||||
return self.mb_data.get(u"author_jid")
|
||||
return self.mb_data.get("author_jid")
|
||||
|
||||
@property
|
||||
def author_jid_verified(self):
|
||||
return self.mb_data.get(u"author_jid_verified")
|
||||
return self.mb_data.get("author_jid_verified")
|
||||
|
||||
@property
|
||||
def author_email(self):
|
||||
return self.mb_data.get(u"author_email")
|
||||
return self.mb_data.get("author_email")
|
||||
|
||||
@property
|
||||
def tags(self):
|
||||
return self.mb_data.get(u'tags', [])
|
||||
return self.mb_data.get('tags', [])
|
||||
|
||||
@property
|
||||
def groups(self):
|
||||
return self.mb_data.get(u'groups', [])
|
||||
return self.mb_data.get('groups', [])
|
||||
|
||||
@property
|
||||
def title(self):
|
||||
return self.mb_data.get(u"title")
|
||||
return self.mb_data.get("title")
|
||||
|
||||
@property
|
||||
def title_xhtml(self):
|
||||
try:
|
||||
return safe(self.mb_data[u"title_xhtml"])
|
||||
return safe(self.mb_data["title_xhtml"])
|
||||
except KeyError:
|
||||
return None
|
||||
|
||||
@property
|
||||
def content(self):
|
||||
return self.mb_data.get(u"content")
|
||||
return self.mb_data.get("content")
|
||||
|
||||
@property
|
||||
def content_xhtml(self):
|
||||
try:
|
||||
return safe(self.mb_data[u"content_xhtml"])
|
||||
return safe(self.mb_data["content_xhtml"])
|
||||
except KeyError:
|
||||
return None
|
||||
|
||||
|
|
@ -164,17 +164,17 @@ class BlogItem(object):
|
|||
def comments(self):
|
||||
if self._comments is None:
|
||||
self._comments = data_format.dict2iterdict(
|
||||
u"comments", self.mb_data, (u"node", u"service")
|
||||
"comments", self.mb_data, ("node", "service")
|
||||
)
|
||||
return self._comments
|
||||
|
||||
@property
|
||||
def comments_service(self):
|
||||
return self.mb_data.get(u"comments_service")
|
||||
return self.mb_data.get("comments_service")
|
||||
|
||||
@property
|
||||
def comments_node(self):
|
||||
return self.mb_data.get(u"comments_node")
|
||||
return self.mb_data.get("comments_node")
|
||||
|
||||
@property
|
||||
def comments_items_list(self):
|
||||
|
|
@ -199,40 +199,40 @@ class BlogItems(object):
|
|||
|
||||
@property
|
||||
def service(self):
|
||||
return self.metadata[u"service"]
|
||||
return self.metadata["service"]
|
||||
|
||||
@property
|
||||
def node(self):
|
||||
return self.metadata[u"node"]
|
||||
return self.metadata["node"]
|
||||
|
||||
@property
|
||||
def uri(self):
|
||||
return self.metadata[u"uri"]
|
||||
return self.metadata["uri"]
|
||||
|
||||
@property
|
||||
def with_rsm(self):
|
||||
"""Return True if RSM is activated on this request"""
|
||||
return u"rsm_first" in self.metadata
|
||||
return "rsm_first" in self.metadata
|
||||
|
||||
@property
|
||||
def rsm_first(self):
|
||||
return self.metadata[u"rsm_first"]
|
||||
return self.metadata["rsm_first"]
|
||||
|
||||
@property
|
||||
def rsm_last(self):
|
||||
return self.metadata[u"rsm_last"]
|
||||
return self.metadata["rsm_last"]
|
||||
|
||||
@property
|
||||
def rsm_index(self):
|
||||
return self.metadata[u"rsm_index"]
|
||||
return self.metadata["rsm_index"]
|
||||
|
||||
@property
|
||||
def rsm_count(self):
|
||||
return self.metadata[u"rsm_count"]
|
||||
return self.metadata["rsm_count"]
|
||||
|
||||
@property
|
||||
def complete(self):
|
||||
return self.metadata[u"complete"]
|
||||
return self.metadata["complete"]
|
||||
|
||||
def __len__(self):
|
||||
return self.items.__len__()
|
||||
|
|
@ -282,14 +282,14 @@ class Message(object):
|
|||
try:
|
||||
return self._message_data[""]
|
||||
except KeyError:
|
||||
return next(self._message_data.itervalues())
|
||||
return next(iter(self._message_data.values()))
|
||||
|
||||
@property
|
||||
def subject(self):
|
||||
try:
|
||||
return self._subject_data[""]
|
||||
except KeyError:
|
||||
return next(self._subject_data.itervalues())
|
||||
return next(iter(self._subject_data.values()))
|
||||
|
||||
@property
|
||||
def type(self):
|
||||
|
|
@ -322,7 +322,7 @@ class Message(object):
|
|||
try:
|
||||
return safe(self._html[""])
|
||||
except KeyError:
|
||||
return safe(next(self._html.itervalues()))
|
||||
return safe(next(iter(self._html.values())))
|
||||
|
||||
|
||||
class Messages(object):
|
||||
|
|
@ -419,5 +419,5 @@ class OnClick(object):
|
|||
values will be quoted before being used
|
||||
"""
|
||||
return self.url.format(
|
||||
*[q(a) for a in args], **{k: ObjectQuoter(v) for k, v in kwargs.iteritems()}
|
||||
*[q(a) for a in args], **{k: ObjectQuoter(v) for k, v in kwargs.items()}
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in a new issue