Mercurial > libervia-desktop-kivy
diff libervia/desktop_kivy/core/kivy_hack.py @ 495:59bdf78bd1d9
installation: update to use hatch following change in backend and other frontends:
- `setup.py` and `requirements.txt` have been removed in favor of `pyproject.toml`
- changed versionning mechanism to use a version directly in
`libervia/desktop_kivy/__init__.py` handled by Hatch
- remove the log hack from `kivy_hack` as there is now an environment variable to disable
the logging hijacking
author | Goffi <goffi@goffi.org> |
---|---|
date | Mon, 28 Aug 2023 18:29:18 +0200 |
parents | b3cedbee561d |
children |
line wrap: on
line diff
--- a/libervia/desktop_kivy/core/kivy_hack.py Mon Aug 28 17:09:15 2023 +0200 +++ b/libervia/desktop_kivy/core/kivy_hack.py Mon Aug 28 18:29:18 2023 +0200 @@ -1,5 +1,4 @@ -#!/usr//bin/env python2 - +#!/usr//bin/env python3 #Libervia Desktop-Kivy # Copyright (C) 2016-2021 Jérôme Poisson (goffi@goffi.org) @@ -17,54 +16,24 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -CONF_KIVY_LEVEL = 'log_kivy_level' +from .constants import Const as C +from libervia.backend.core import log_config +import os +import sys def do_hack(): """work around Kivy hijacking of logs and arguments""" # we remove args so kivy doesn't use them # this is need to avoid kivy breaking QuickApp args handling - import sys ori_argv = sys.argv[:] sys.argv = sys.argv[:1] - from .constants import Const as C - from libervia.backend.core import log_config log_config.libervia_configure(C.LOG_BACKEND_STANDARD, C) - from . import config - kivy_level = config.config_get(C.CONFIG_SECTION, CONF_KIVY_LEVEL, 'follow').upper() + os.environ["KIVY_LOG_MODE"] = "PYTHON" - # kivy handles its own loggers, we don't want that! - import logging - root_logger = logging.root - kivy_logger = logging.getLogger('kivy') - ori_addHandler = kivy_logger.addHandler - kivy_logger.addHandler = lambda __: None - ori_setLevel = kivy_logger.setLevel - if kivy_level == 'FOLLOW': - # level is following SàT level - kivy_logger.setLevel = lambda level: None - elif kivy_level == 'KIVY': - # level will be set by Kivy according to its own conf - pass - elif kivy_level in C.LOG_LEVELS: - kivy_logger.setLevel(kivy_level) - kivy_logger.setLevel = lambda level: None - else: - raise ValueError("Unknown value for {name}: {value}".format(name=CONF_KIVY_LEVEL, value=kivy_level)) - - # during import kivy set its logging stuff import kivy - kivy # to avoid pyflakes warning - - # we want to separate kivy logs from other logs - logging.root = root_logger - from kivy import logger - sys.stderr = logger.previous_stderr - - # we restore original methods - kivy_logger.addHandler = ori_addHandler - kivy_logger.setLevel = ori_setLevel + assert kivy # to avoid pyflakes warning # we restore original arguments sys.argv = ori_argv