From 0deef898ffe39191ca2b440119a3e29c4d9230b5 Mon Sep 17 00:00:00 2001
From: as3ii <as3ii777@gmail.com>
Date: Thu, 13 Nov 2025 19:55:53 +0100
Subject: [PATCH] Fixed ruff rule E401 and E402

See https://peps.python.org/pep-0008/#imports
---
 freedata_server/helpers.py          |  4 ----
 freedata_server/maidenhead.py       |  7 -------
 freedata_server/server.py           | 16 ++++++++--------
 freedata_server/socket_interface.py |  8 ++------
 tests/test_server.py                |  3 ++-
 5 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/freedata_server/helpers.py b/freedata_server/helpers.py
index c24b13fa..65810a38 100644
--- a/freedata_server/helpers.py
+++ b/freedata_server/helpers.py
@@ -181,10 +181,6 @@ def get_crc_32(data: str) -> bytes:
     return crc.to_bytes(4, byteorder="big")
 
 
-from datetime import datetime, timezone
-import time
-
-
 def add_to_heard_stations(
     dxcallsign,
     dxgrid,
diff --git a/freedata_server/maidenhead.py b/freedata_server/maidenhead.py
index 278fc114..b7ba8ef8 100644
--- a/freedata_server/maidenhead.py
+++ b/freedata_server/maidenhead.py
@@ -98,13 +98,6 @@ def distance_between_locators(locator1, locator2):
     return {"kilometers": km, "miles": miles}
 
 
-import random
-
-
-import random
-import string
-
-
 def generate_full_maidenhead(grid_square):
     """
     Convert a Maidenhead locator of 2 or 4 characters to a 6-character locator
diff --git a/freedata_server/server.py b/freedata_server/server.py
index 3be21fda..ff842bbd 100644
--- a/freedata_server/server.py
+++ b/freedata_server/server.py
@@ -13,6 +13,14 @@ from freedata_server.log_handler import setup_logging
 from freedata_server.constants import CONFIG_ENV_VAR, DEFAULT_CONFIG_FILE, API_VERSION
 from freedata_server.context import AppContext
 
+from freedata_server.api.general import router as general_router
+from freedata_server.api.config import router as config_router
+from freedata_server.api.devices import router as devices_router
+from freedata_server.api.radio import router as radio_router
+from freedata_server.api.modem import router as modem_router
+from freedata_server.api.freedata import router as freedata_router
+from freedata_server.api.websocket import router as websocket_router
+
 import uvicorn
 
 
@@ -100,14 +108,6 @@ else:
     logger.warning("GUI directory not found: %s", gui_dir)
 
 # Register routers
-from freedata_server.api.general import router as general_router
-from freedata_server.api.config import router as config_router
-from freedata_server.api.devices import router as devices_router
-from freedata_server.api.radio import router as radio_router
-from freedata_server.api.modem import router as modem_router
-from freedata_server.api.freedata import router as freedata_router
-from freedata_server.api.websocket import router as websocket_router
-
 app.include_router(general_router, prefix="", tags=["General"])
 app.include_router(config_router, prefix="/config", tags=["Configuration"])
 app.include_router(devices_router, prefix="/devices", tags=["Devices"])
diff --git a/freedata_server/socket_interface.py b/freedata_server/socket_interface.py
index b2f4a74e..ded22a6a 100644
--- a/freedata_server/socket_interface.py
+++ b/freedata_server/socket_interface.py
@@ -1,12 +1,8 @@
-"""WORK IN PROGRESS by DJ2LS"""
+"""WORK IN PROGRESS by DJ2LS.
 
-import time
-
-"""
-access command handler from external via: 
+Access command handler from external via:
     self.socket_manager.command_server.command_handler.<function>
     self.socket_manager.data_server.data_handler.<function>
-
 """
 
 import socketserver
diff --git a/tests/test_server.py b/tests/test_server.py
index a28c372d..d5967116 100755
--- a/tests/test_server.py
+++ b/tests/test_server.py
@@ -1,6 +1,7 @@
 import unittest
 from subprocess import Popen, PIPE
-import shlex, os
+import shlex
+import os
 import requests
 import time
 import json