Cleanup

ogn/collect/logbook.py

@@ -5,9 +5,9 @@ from datetime import datetime
 from celery.utils.log import get_task_logger
 from ogn.collect.celery import app
 
-from sqlalchemy.sql import func, null
+from sqlalchemy.sql import func
-from sqlalchemy import and_, or_, insert, between
+from sqlalchemy import and_, or_, insert
-from sqlalchemy.sql.expression import case, true, false, label
+from sqlalchemy.sql.expression import case
 
 from ogn.model import AircraftBeacon, TakeoffLanding
 

ogn/commands/logbook.py

@@ -3,8 +3,8 @@
 from datetime import timedelta
 
 from sqlalchemy.sql import func, null
-from sqlalchemy import and_, or_, insert, between
+from sqlalchemy import and_, or_, between
-from sqlalchemy.sql.expression import case, true, false, label
+from sqlalchemy.sql.expression import true, false, label
 
 from ogn.model import Flarm, TakeoffLanding
 

ogn/commands/showreceiver.py

@@ -3,8 +3,7 @@ from datetime import datetime, timedelta
 from sqlalchemy.sql import func
 from sqlalchemy import distinct, and_
 
-from ogn.model import ReceiverBeacon
+from ogn.model import ReceiverBeacon, ReceiverDevice
-from ogn.model.receiver_device import ReceiverDevice
 
 from ogn.commands.dbutils import session