From e69966414ef102fb7ffdaa77c1dd99e89589a7e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= Date: Sun, 15 Nov 2015 19:54:11 +0100 Subject: [PATCH] Cleanup --- ogn/collect/logbook.py | 6 +++--- ogn/commands/logbook.py | 4 ++-- ogn/commands/showreceiver.py | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ogn/collect/logbook.py b/ogn/collect/logbook.py index 9d8626f..59e835e 100644 --- a/ogn/collect/logbook.py +++ b/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 import and_, or_, insert, between -from sqlalchemy.sql.expression import case, true, false, label +from sqlalchemy.sql import func +from sqlalchemy import and_, or_, insert +from sqlalchemy.sql.expression import case from ogn.model import AircraftBeacon, TakeoffLanding diff --git a/ogn/commands/logbook.py b/ogn/commands/logbook.py index cc23558..fae6331 100644 --- a/ogn/commands/logbook.py +++ b/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.sql.expression import case, true, false, label +from sqlalchemy import and_, or_, between +from sqlalchemy.sql.expression import true, false, label from ogn.model import Flarm, TakeoffLanding diff --git a/ogn/commands/showreceiver.py b/ogn/commands/showreceiver.py index c484884..1b798b3 100644 --- a/ogn/commands/showreceiver.py +++ b/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.receiver_device import ReceiverDevice +from ogn.model import ReceiverBeacon, ReceiverDevice from ogn.commands.dbutils import session