# HG changeset patch # User Goffi # Date 1638371611 -3600 # Node ID b9718216a1c0b5f2149dab3f232711eb4347ddda # Parent af09b5aaa5d7331f5c6d1325e2c9036cbb35dd50# Parent 09f5ac48ffe328f9096cf69c18d0aba289d45103 merge bookmark 0.9 diff -r 09f5ac48ffe3 -r b9718216a1c0 .hgtags --- a/.hgtags Fri Nov 12 17:21:24 2021 +0100 +++ b/.hgtags Wed Dec 01 16:13:31 2021 +0100 @@ -24,3 +24,4 @@ 86bfdf73d24a7a1b7f56abdf5ca51552c6e41101 0.7.0b4 c7138e9132138f79ba66b0d65c45d45399f55a2b 0.7.0 efe2445b053c989c73d0f0462cf7543de9d67f1c v0.8.0b1 +f97be63871e4187d6db5667fd0df264c64017655 v0.8.0 diff -r 09f5ac48ffe3 -r b9718216a1c0 CHANGELOG --- a/CHANGELOG Fri Nov 12 17:21:24 2021 +0100 +++ b/CHANGELOG Wed Dec 01 16:13:31 2021 +0100 @@ -1,6 +1,6 @@ All theses changelogs are not exhaustive, please check the Mercurial repository for more details. -v 0.8.0 « La Cecília » (NOT RELEASED YET): +v 0.8.0 « La Cecília » (30/11/2021): - renamed the project from "Salut à Toi" to "Libervia" - frontends are renamed "Libervia XXX" (where XXX is Desktop, Web, etc.), former names are kept as aliases - Python 3 port diff -r 09f5ac48ffe3 -r b9718216a1c0 sat/VERSION diff -r 09f5ac48ffe3 -r b9718216a1c0 sat/core/xmpp.py --- a/sat/core/xmpp.py Fri Nov 12 17:21:24 2021 +0100 +++ b/sat/core/xmpp.py Wed Dec 01 16:13:31 2021 +0100 @@ -386,9 +386,7 @@ # TODO: create a ticket upstream, Twisted should work when optimization # is used reason_str = str(reason.value.__class__) - log.warning("Connection {term_type}: {reason}".format( - term_type = term_type, - reason=reason_str)) + log.warning(f"[{self.profile}] Connection {term_type}: {reason_str}") if not self.host_app.trigger.point("connection_" + term_type, connector, reason): return return cb(connector, reason) diff -r 09f5ac48ffe3 -r b9718216a1c0 sat/memory/params.py --- a/sat/memory/params.py Fri Nov 12 17:21:24 2021 +0100 +++ b/sat/memory/params.py Wed Dec 01 16:13:31 2021 +0100 @@ -415,7 +415,7 @@ if node.getAttribute("type") == "bool": return C.bool(value_to_use) if node.getAttribute("type") == "int": - return int(value_to_use) + return int(value_to_use) if value_to_use else value_to_use elif node.getAttribute("type") == "list": if ( not value_to_use diff -r 09f5ac48ffe3 -r b9718216a1c0 sat/tools/common/async_process.py --- a/sat/tools/common/async_process.py Fri Nov 12 17:21:24 2021 +0100 +++ b/sat/tools/common/async_process.py Wed Dec 01 16:13:31 2021 +0100 @@ -131,6 +131,9 @@ else: command = cls.command cmd_args = [command] + args + if "env" not in kwargs: + # we pass parent environment by default + kwargs["env"] = None reactor.spawnProcess(prot, command, cmd_args, diff -r 09f5ac48ffe3 -r b9718216a1c0 setup.py --- a/setup.py Fri Nov 12 17:21:24 2021 +0100 +++ b/setup.py Wed Dec 01 16:13:31 2021 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SAT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # Copyright (C) 2013-2016 Adrien Cossa (souliane@mailoo.org)