From: Aleš Mrázek <ales.mrazek@nic.cz>
Date: Thu, 15 Aug 2024 13:01:24 +0000 (+0200)
Subject: manager: removed nice syntax error on old Python versions
X-Git-Tag: v6.0.9~18^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20553b40218b32c53a218b4691f2d69759cc8ad4;p=thirdparty%2Fknot-resolver.git

manager: removed nice syntax error on old Python versions
---

diff --git a/pyproject.toml b/pyproject.toml
index 80a219011..d4a6063ae 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -66,7 +66,7 @@ json-schema-for-humans = "^0.47"
 
 [tool.poetry.scripts]
 kresctl = 'knot_resolver_manager.client.main:main'
-knot-resolver = 'knot_resolver_manager.manager.__main__:run'
+knot-resolver = 'knot_resolver_manager.manager.main:main'
 
 [tool.poe.tasks]
 # tasks runed through scripts located in 'scripts/poe-tasks/'
diff --git a/python/knot_resolver_manager/manager/__main__.py b/python/knot_resolver_manager/manager/__main__.py
index 22eb960b5..ca5fef3b0 100644
--- a/python/knot_resolver_manager/manager/__main__.py
+++ b/python/knot_resolver_manager/manager/__main__.py
@@ -1,15 +1,5 @@
-# pylint: skip-file
-# flake8: noqa
-
-
-def run():
-    # throws nice syntax error on old Python versions:
-    0_0  # Python >= 3.7 required
-
-    from knot_resolver_manager.manager import main
-
-    main.main()
+from knot_resolver_manager.manager.main import main
 
 
 if __name__ == "__main__":
-    run()
+    main()
diff --git a/setup.py b/setup.py
index 3f17e9425..bf1fb25e1 100644
--- a/setup.py
+++ b/setup.py
@@ -29,8 +29,7 @@ extras_require = \
 {'prometheus': ['prometheus-client']}
 
 entry_points = \
-{'console_scripts': ['knot-resolver = '
-                     'knot_resolver_manager.manager.__main__:run',
+{'console_scripts': ['knot-resolver = knot_resolver_manager.manager.main:main',
                      'kresctl = knot_resolver_manager.client.main:main']}
 
 setup_kwargs = {