From bee218e560374569cd032a4234adcf88b0242f16 Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Tue, 4 Apr 2023 16:05:36 +0200
Subject: [PATCH] fix configpanel.py and form.py imports

---
 src/app.py                  | 5 ++---
 src/domain.py               | 3 ++-
 src/settings.py             | 3 ++-
 src/tests/test_questions.py | 2 +-
 src/utils/configpanel.py    | 7 +++++++
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/app.py b/src/app.py
index b37b680ec..1daa14d98 100644
--- a/src/app.py
+++ b/src/app.py
@@ -48,9 +48,8 @@ from moulinette.utils.filesystem import (
     chmod,
 )
 
-from yunohost.utils.config import (
-    ConfigPanel,
-    ask_questions_and_parse_answers,
+from yunohost.utils.configpanel import ConfigPanel, ask_questions_and_parse_answers
+from yunohost.utils.form import (
     DomainQuestion,
     PathQuestion,
     hydrate_questions_with_choices,
diff --git a/src/domain.py b/src/domain.py
index 7839b988d..9f38d6765 100644
--- a/src/domain.py
+++ b/src/domain.py
@@ -33,7 +33,8 @@ from yunohost.app import (
     _get_conflicting_apps,
 )
 from yunohost.regenconf import regen_conf, _force_clear_hashes, _process_regen_conf
-from yunohost.utils.config import ConfigPanel, Question
+from yunohost.utils.configpanel import ConfigPanel
+from yunohost.utils.form import Question
 from yunohost.utils.error import YunohostError, YunohostValidationError
 from yunohost.log import is_unit_operation
 
diff --git a/src/settings.py b/src/settings.py
index 4905049d6..5d52329b3 100644
--- a/src/settings.py
+++ b/src/settings.py
@@ -21,7 +21,8 @@ import subprocess
 
 from moulinette import m18n
 from yunohost.utils.error import YunohostError, YunohostValidationError
-from yunohost.utils.config import ConfigPanel, Question
+from yunohost.utils.configpanel import ConfigPanel
+from yunohost.utils.form import Question
 from moulinette.utils.log import getActionLogger
 from yunohost.regenconf import regen_conf
 from yunohost.firewall import firewall_reload
diff --git a/src/tests/test_questions.py b/src/tests/test_questions.py
index 8ded2e137..506fde077 100644
--- a/src/tests/test_questions.py
+++ b/src/tests/test_questions.py
@@ -14,7 +14,7 @@ from _pytest.mark.structures import ParameterSet
 
 from moulinette import Moulinette
 from yunohost import app, domain, user
-from yunohost.utils.config import (
+from yunohost.utils.form import (
     ARGUMENTS_TYPE_PARSERS,
     ask_questions_and_parse_answers,
     DisplayTextQuestion,
diff --git a/src/utils/configpanel.py b/src/utils/configpanel.py
index 1f1351bcb..e50d0a3ec 100644
--- a/src/utils/configpanel.py
+++ b/src/utils/configpanel.py
@@ -35,6 +35,13 @@ from moulinette.utils.filesystem import (
 
 from yunohost.utils.i18n import _value_for_locale
 from yunohost.utils.error import YunohostError, YunohostValidationError
+from yunohost.utils.form import (
+    ARGUMENTS_TYPE_PARSERS,
+    FileQuestion,
+    Question,
+    ask_questions_and_parse_answers,
+    evaluate_simple_js_expression,
+)
 
 logger = getActionLogger("yunohost.configpanel")
 CONFIG_PANEL_VERSION_SUPPORTED = 1.0