diff --git a/src/utils/configpanel.py b/src/utils/configpanel.py index fcdaea193..2c56eb754 100644 --- a/src/utils/configpanel.py +++ b/src/utils/configpanel.py @@ -23,25 +23,19 @@ import urllib.parse from collections import OrderedDict from typing import Union -from moulinette.interfaces.cli import colorize from moulinette import Moulinette, m18n +from moulinette.interfaces.cli import colorize +from moulinette.utils.filesystem import mkdir, read_toml, read_yaml, write_to_yaml from moulinette.utils.log import getActionLogger -from moulinette.utils.filesystem import ( - read_toml, - read_yaml, - write_to_yaml, - mkdir, -) - -from yunohost.utils.i18n import _value_for_locale from yunohost.utils.error import YunohostError, YunohostValidationError from yunohost.utils.form import ( OPTIONS, - FileOption, BaseOption, + FileOption, ask_questions_and_parse_answers, evaluate_simple_js_expression, ) +from yunohost.utils.i18n import _value_for_locale logger = getActionLogger("yunohost.configpanel") CONFIG_PANEL_VERSION_SUPPORTED = 1.0 diff --git a/src/utils/form.py b/src/utils/form.py index df70b1695..12c3249c3 100644 --- a/src/utils/form.py +++ b/src/utils/form.py @@ -16,26 +16,22 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # -import os -import re -import urllib.parse -import tempfile -import shutil import ast import operator as op -from typing import Optional, Dict, List, Union, Any, Mapping, Callable +import os +import re +import shutil +import tempfile +import urllib.parse +from typing import Any, Callable, Dict, List, Mapping, Optional, Union -from moulinette.interfaces.cli import colorize from moulinette import Moulinette, m18n +from moulinette.interfaces.cli import colorize +from moulinette.utils.filesystem import read_file, write_to_file from moulinette.utils.log import getActionLogger -from moulinette.utils.filesystem import ( - read_file, - write_to_file, -) - -from yunohost.utils.i18n import _value_for_locale -from yunohost.utils.error import YunohostError, YunohostValidationError from yunohost.log import OperationLogger +from yunohost.utils.error import YunohostError, YunohostValidationError +from yunohost.utils.i18n import _value_for_locale logger = getActionLogger("yunohost.form")