From fce97431d5c341d81db4e6beaf65799472bb81dd Mon Sep 17 00:00:00 2001
From: David Trattnig <david@subsquare.at>
Date: Mon, 25 Jul 2022 15:53:09 +0200
Subject: [PATCH] Style: Sort imports
---
src/base/api.py | 6 ++++--
src/control.py | 2 +-
src/engine.py | 5 +++--
src/mixer.py | 2 +-
src/plugins/clock.py | 2 +-
tests/test_simple_api.py | 2 +-
6 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/base/api.py b/src/base/api.py
index b9f0a898..79868a18 100644
--- a/src/base/api.py
+++ b/src/base/api.py
@@ -17,11 +17,13 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+import json
import logging
+
import requests
-import json
-from src.base.utils import SimpleUtil as SU, DotDict
+from src.base.utils import DotDict
+from src.base.utils import SimpleUtil as SU
class SimpleApi:
diff --git a/src/control.py b/src/control.py
index 36d5c48a..bfd94cb8 100644
--- a/src/control.py
+++ b/src/control.py
@@ -27,9 +27,9 @@ from threading import Lock, Thread, Timer
from http_parser.http import HttpStream
from http_parser.reader import SocketReader
+from src.base.api import LiquidsoapUtil as LU
from src.base.config import AuraConfig
from src.base.utils import SimpleUtil as SU
-from src.base.api import LiquidsoapUtil as LU
class EngineControlInterface:
diff --git a/src/engine.py b/src/engine.py
index 5e2e9313..729c8382 100644
--- a/src/engine.py
+++ b/src/engine.py
@@ -24,6 +24,7 @@ from contextlib import suppress
from threading import Thread
import meta
+from src.base.api import LiquidsoapUtil as LU
from src.base.config import AuraConfig
from src.base.exceptions import (
InvalidChannelException,
@@ -31,8 +32,8 @@ from src.base.exceptions import (
LQConnectionError,
LQStreamException,
)
-from src.base.utils import SimpleUtil as SU, DotDict
-from src.base.api import LiquidsoapUtil as LU
+from src.base.utils import DotDict
+from src.base.utils import SimpleUtil as SU
from src.channels import (
Channel,
ChannelResolver,
diff --git a/src/mixer.py b/src/mixer.py
index a6d3b76b..df7d7a9e 100644
--- a/src/mixer.py
+++ b/src/mixer.py
@@ -21,9 +21,9 @@ import logging
import time
from enum import Enum
+from src.base.api import LiquidsoapUtil as LU
from src.base.exceptions import LQConnectionError
from src.base.utils import SimpleUtil as SU
-from src.base.api import LiquidsoapUtil as LU
class MixerType(Enum):
diff --git a/src/plugins/clock.py b/src/plugins/clock.py
index 34eb1745..38dbfcdd 100644
--- a/src/plugins/clock.py
+++ b/src/plugins/clock.py
@@ -19,8 +19,8 @@
import logging
-from src.base.config import AuraConfig
from src.base.api import SimpleApi
+from src.base.config import AuraConfig
from src.resources import ResourceUtil
diff --git a/tests/test_simple_api.py b/tests/test_simple_api.py
index 22195845..28510c9b 100644
--- a/tests/test_simple_api.py
+++ b/tests/test_simple_api.py
@@ -19,8 +19,8 @@
import unittest
-from src.base.config import AuraConfig
from src.base.api import SimpleApi
+from src.base.config import AuraConfig
class TestApi(unittest.TestCase):
--
GitLab