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
|
||||
|
|
@ -23,7 +23,7 @@ log = getLogger(__name__)
|
|||
from sat.tools.common import regex
|
||||
from sat.core import exceptions
|
||||
from sat.core.constants import Const as C
|
||||
import cPickle as pickle
|
||||
import pickle as pickle
|
||||
import mimetypes
|
||||
import os.path
|
||||
import time
|
||||
|
|
@ -42,9 +42,9 @@ class Cache(object):
|
|||
self.profile = profile
|
||||
path_elts = [host.memory.getConfig("", "local_dir"), C.CACHE_DIR]
|
||||
if profile:
|
||||
path_elts.extend([u"profiles", regex.pathEscape(profile)])
|
||||
path_elts.extend(["profiles", regex.pathEscape(profile)])
|
||||
else:
|
||||
path_elts.append(u"common")
|
||||
path_elts.append("common")
|
||||
self.cache_dir = os.path.join(*path_elts)
|
||||
|
||||
if not os.path.exists(self.cache_dir):
|
||||
|
|
@ -55,11 +55,11 @@ class Cache(object):
|
|||
|
||||
@param filename(unicode): cached file name (cache data or actual file)
|
||||
"""
|
||||
if not filename or u"/" in filename:
|
||||
if not filename or "/" in filename:
|
||||
log.error(
|
||||
u"invalid char found in file name, hack attempt? name:{}".format(filename)
|
||||
"invalid char found in file name, hack attempt? name:{}".format(filename)
|
||||
)
|
||||
raise exceptions.DataError(u"Invalid char found")
|
||||
raise exceptions.DataError("Invalid char found")
|
||||
return os.path.join(self.cache_dir, filename)
|
||||
|
||||
def getMetadata(self, uid):
|
||||
|
|
@ -73,7 +73,7 @@ class Cache(object):
|
|||
|
||||
uid = uid.strip()
|
||||
if not uid:
|
||||
raise exceptions.InternalError(u"uid must not be empty")
|
||||
raise exceptions.InternalError("uid must not be empty")
|
||||
cache_url = self.getPath(uid)
|
||||
if not os.path.exists(cache_url):
|
||||
return None
|
||||
|
|
@ -82,20 +82,20 @@ class Cache(object):
|
|||
with open(cache_url, "rb") as f:
|
||||
cache_data = pickle.load(f)
|
||||
except IOError:
|
||||
log.warning(u"can't read cache at {}".format(cache_url))
|
||||
log.warning("can't read cache at {}".format(cache_url))
|
||||
return None
|
||||
except pickle.UnpicklingError:
|
||||
log.warning(u"invalid cache found at {}".format(cache_url))
|
||||
log.warning("invalid cache found at {}".format(cache_url))
|
||||
return None
|
||||
|
||||
try:
|
||||
eol = cache_data["eol"]
|
||||
except KeyError:
|
||||
log.warning(u"no End Of Life found for cached file {}".format(uid))
|
||||
log.warning("no End Of Life found for cached file {}".format(uid))
|
||||
eol = 0
|
||||
if eol < time.time():
|
||||
log.debug(
|
||||
u"removing expired cache (expired for {}s)".format(time.time() - eol)
|
||||
"removing expired cache (expired for {}s)".format(time.time() - eol)
|
||||
)
|
||||
return None
|
||||
|
||||
|
|
@ -135,11 +135,11 @@ class Cache(object):
|
|||
ext = mimetypes.guess_extension(mime_type, strict=False)
|
||||
if ext is None:
|
||||
log.warning(
|
||||
u"can't find extension for MIME type {}".format(mime_type)
|
||||
"can't find extension for MIME type {}".format(mime_type)
|
||||
)
|
||||
ext = DEFAULT_EXT
|
||||
elif ext == u".jpe":
|
||||
ext = u".jpg"
|
||||
elif ext == ".jpe":
|
||||
ext = ".jpg"
|
||||
else:
|
||||
ext = DEFAULT_EXT
|
||||
mime_type = None
|
||||
|
|
@ -147,10 +147,10 @@ class Cache(object):
|
|||
if max_age is None:
|
||||
max_age = C.DEFAULT_MAX_AGE
|
||||
cache_data = {
|
||||
u"source": source,
|
||||
u"filename": filename,
|
||||
u"eol": int(time.time()) + max_age,
|
||||
u"mime_type": mime_type,
|
||||
"source": source,
|
||||
"filename": filename,
|
||||
"eol": int(time.time()) + max_age,
|
||||
"mime_type": mime_type,
|
||||
}
|
||||
file_path = self.getPath(filename)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue