remove unused imports

bumper/__init__.py

@@ -1,10 +1,9 @@
-
 import asyncio
 import importlib
+import logging
 import pkgutil
 import socket
 import sys
-from typing import Optional
 
 from bumper.confserver import ConfServer, WebServerBinding
 from bumper.db import *

bumper/confserver.py

@@ -14,16 +14,16 @@ import jinja2
 from aiohttp import web
 from aiohttp.typedefs import Handler
 from aiohttp.web_exceptions import (
+    HTTPBadRequest,
     HTTPInternalServerError,
     HTTPNoContent,
-    HTTPBadRequest,
 )
 from aiohttp.web_request import Request
 from aiohttp.web_response import Response, StreamResponse
 
 import bumper
-from .plugins import ConfServerApp
 
+from .plugins import ConfServerApp
 from .util import get_logger
 
 

bumper/db.py

@@ -1,19 +1,10 @@
-
-import json
-import logging
 import os
 from datetime import datetime, timedelta
 
 from tinydb import Query, TinyDB
 
 import bumper
-from bumper.models import (
+from bumper.models import BumperUser, OAuth, VacBotClient, VacBotDevice
-    BumperUser,
-    EcoVacsHomeProducts,
-    OAuth,
-    VacBotClient,
-    VacBotDevice,
-)
 
 from .util import get_logger
 

bumper/models.py

@@ -1,4 +1,3 @@
-
 import copy
 import json
 import uuid

bumper/mqttserver.py

@@ -1,4 +1,3 @@
-
 """Mqtt module."""
 
 import asyncio

bumper/plugins.py

@@ -1,9 +1,3 @@
-
-import asyncio
-
-from aiohttp import web
-
-
 class ConfServerApp:
     name = None
     plugin_type = None

bumper/plugins/bumper_confserver_portal_appsvr.py

@@ -1,4 +1,3 @@
-
 import json
 import logging
 

bumper/plugins/bumper_confserver_portal_dim.py

@@ -1,15 +1,12 @@
-
+import json
-import asyncio
 import logging
 import random
 import string
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
 
 
 class portal_api_dim(plugins.ConfServerApp):

bumper/plugins/bumper_confserver_portal_ecms.py

@@ -1,10 +1,8 @@
-
 import logging
 
 from aiohttp import web
 
 from bumper import plugins
-from bumper.models import *
 
 
 class portal_api_ecms(plugins.ConfServerApp):

bumper/plugins/bumper_confserver_portal_iot.py

@@ -1,15 +1,12 @@
-
+import json
-import asyncio
 import logging
 import random
 import string
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
 
 
 class portal_api_iot(plugins.ConfServerApp):

bumper/plugins/bumper_confserver_portal_lg.py

@@ -1,4 +1,4 @@
-
+import json
 import logging
 import random
 import string
@@ -6,8 +6,8 @@ import xml.etree.ElementTree as ET
 
 from aiohttp import web
 
+import bumper
 from bumper import plugins
-from bumper.models import *
 
 
 class portal_api_lg(plugins.ConfServerApp):

bumper/plugins/bumper_confserver_portal_neng.py

@@ -1,13 +1,8 @@
-
-import asyncio
 import logging
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
-import bumper
 from bumper import plugins
-from bumper.models import *
 
 
 class portal_api_neng(plugins.ConfServerApp):

bumper/plugins/bumper_confserver_portal_pim.py

@@ -1,11 +1,11 @@
-
+import json
 import logging
 import os
 
 from aiohttp import web
 
-from bumper import plugins
+import bumper
-from bumper.models import *
+from bumper import EcoVacsHomeProducts, plugins
 
 
 class portal_api_pim(plugins.ConfServerApp):

bumper/plugins/bumper_confserver_portal_rapp.py

@@ -1,10 +1,8 @@
-
 import logging
 
 from aiohttp import web
 
 from bumper import plugins
-from bumper.models import *
 
 
 class api_rapp(plugins.ConfServerApp):

bumper/plugins/bumper_confserver_portal_users.py

@@ -1,13 +1,10 @@
-
+import json
-import asyncio
 import logging
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
 
 
 class portal_api_users(plugins.ConfServerApp):

bumper/plugins/bumper_confserver_upload_global.py

@@ -1,14 +1,10 @@
-
-import asyncio
 import logging
 import os
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
 
 
 class upload_global(plugins.ConfServerApp):

bumper/plugins/bumper_confserver_v1_global_auth.py

@@ -1,13 +1,6 @@
-
-import asyncio
-import logging
-from datetime import datetime, timedelta
-
 from aiohttp import web
 
-import bumper
 from bumper import plugins
-from bumper.models import *
 from bumper.rest import auth_util
 
 

bumper/plugins/bumper_confserver_v1_private_ad.py

@@ -1,13 +1,9 @@
-
-import asyncio
 import logging
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
 from bumper.util import get_current_time_as_millis
 
 

bumper/plugins/bumper_confserver_v1_private_campaign.py

@@ -1,5 +1,3 @@
-
-import asyncio
 import logging
 from datetime import datetime, timedelta
 
@@ -7,8 +5,7 @@ from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
+from bumper.util import convert_to_millis, get_current_time_as_millis
-from bumper.util import get_current_time_as_millis
 
 
 class v1_private_campaign(plugins.ConfServerApp):

bumper/plugins/bumper_confserver_v1_private_common.py

@@ -1,10 +1,9 @@
-
 import logging
 
 from aiohttp import web
 
+import bumper
 from bumper import plugins
-from bumper.models import *
 from bumper.util import get_current_time_as_millis
 
 

bumper/plugins/bumper_confserver_v1_private_message.py

@@ -1,13 +1,9 @@
-
-import asyncio
 import logging
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
 from bumper.util import get_current_time_as_millis
 
 

bumper/plugins/bumper_confserver_v1_private_shop.py

@@ -1,13 +1,9 @@
-
-import asyncio
 import logging
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
 from bumper.util import get_current_time_as_millis
 
 

bumper/plugins/bumper_confserver_v1_private_user.py

@@ -1,13 +1,9 @@
-
-import asyncio
 import logging
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
 from bumper.rest import auth_util
 from bumper.util import get_current_time_as_millis
 

bumper/plugins/bumper_confserver_v1_private_userSetting.py

@@ -1,4 +1,3 @@
-
 import logging
 
 from aiohttp import web

bumper/plugins/bumper_confserver_v2_private_user.py

@@ -1,4 +1,3 @@
-
 from aiohttp import web
 
 from bumper import plugins

bumper/rest/auth_util.py

@@ -6,11 +6,11 @@ from aiohttp import web
 
 import bumper
 from bumper import (
-    get_logger,
-    EcoVacsHome_Login,
-    EcoVacs_Login,
     API_ERRORS,
     RETURN_API_SUCCESS,
+    EcoVacs_Login,
+    EcoVacsHome_Login,
+    get_logger,
 )
 from bumper.util import get_current_time_as_millis
 

bumper/xmppserver.py

@@ -1,8 +1,5 @@
-
-
 import asyncio
 import base64
-import logging
 import re
 import ssl
 import uuid

tests/conftest.py

@@ -5,7 +5,7 @@ from amqtt.client import MQTTClient
 
 import bumper
 from bumper import WebServerBinding
-from tests import HOST, MQTT_PORT, CONF_SERVER_PORT
+from tests import CONF_SERVER_PORT, HOST, MQTT_PORT
 
 
 @pytest.fixture

tests/test_confserver.py

@@ -5,12 +5,10 @@ import os
 from unittest import mock
 
 import pytest
-from aiohttp import web
-from testfixtures import LogCapture
 
 import bumper
 from bumper import WebServerBinding
-from tests import HOST, MQTT_PORT, CONF_SERVER_PORT
+from tests import CONF_SERVER_PORT, HOST, MQTT_PORT
 
 
 def create_confserver():

tests/test_db.py

@@ -1,14 +1,9 @@
-
-import json
-import logging
 import os
 from datetime import datetime, timedelta
 
-from tinydb import Query, TinyDB
+from tinydb import TinyDB
-from tinydb.storages import MemoryStorage
 
 import bumper
-from bumper.models import BumperUser, EcoVacsHomeProducts, VacBotClient, VacBotDevice
 
 
 def test_db_path():

tests/test_init.py

@@ -1,14 +1,7 @@
 import asyncio
-import json
 import os
-import platform
-from unittest import mock
-from unittest.mock import patch
 
-import pytest
 from testfixtures import LogCapture
-from tinydb import Query, TinyDB
-from tinydb.storages import MemoryStorage
 
 import bumper
 

tests/test_mqttserver.py

@@ -2,7 +2,6 @@ import asyncio
 import os
 import time
 
-import amqtt
 import pytest
 from amqtt.client import MQTTClient
 from amqtt.mqtt.constants import QOS_0

tests/test_xmppserver.py

@@ -1,14 +1,6 @@
 import asyncio
-import json
-import os
-import socket
-import ssl
-import xml.etree.ElementTree as ET
 from unittest import mock
 
-import pytest
-import pytest_asyncio
-import tinydb
 from testfixtures import LogCapture
 
 import bumper