From e495d522345dbaee915df2863b85dc160c9e78a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Sun, 26 Jun 2016 17:59:43 +0200
Subject: [PATCH] flake8 beautifications

---
 ogn/commands/showdevices.py | 24 ++++++++++++------------
 ogn/gateway/process.py      |  1 -
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/ogn/commands/showdevices.py b/ogn/commands/showdevices.py
index 4048b00..5bf02c1 100644
--- a/ogn/commands/showdevices.py
+++ b/ogn/commands/showdevices.py
@@ -1,6 +1,6 @@
 from ogn.commands.dbutils import session
 from ogn.model import Device, AircraftType
-from sqlalchemy import func, and_, true, false
+from sqlalchemy import func
 
 from manager import Manager
 manager = Manager()
@@ -10,9 +10,9 @@ manager = Manager()
 def aircraft_type_stats():
     """Show stats about aircraft types used by devices."""
     aircraft_type_query = session.query(Device.aircraft_type,
-                          func.count(Device.id)) \
-                          .group_by(Device.aircraft_type) \
-                          .order_by(func.count(Device.id).desc())
+                                        func.count(Device.id)) \
+                                 .group_by(Device.aircraft_type) \
+                                 .order_by(func.count(Device.id).desc())
     print("--- Aircraft types ---")
     for [aircraft_type, count] in aircraft_type_query.all():
         at = AircraftType(aircraft_type)
@@ -24,8 +24,8 @@ def stealth_stats():
     """Show stats about stealth flag set by devices."""
     stealth_query = session.query(Device.stealth,
                                   func.count(Device.id)) \
-                                .group_by(Device.stealth) \
-                                .order_by(func.count(Device.id).desc())
+                           .group_by(Device.stealth) \
+                           .order_by(func.count(Device.id).desc())
     print("--- Stealth ---")
     for [is_stealth, count] in stealth_query.all():
         print("{}: {}".format(is_stealth, count))
@@ -35,9 +35,9 @@ def stealth_stats():
 def software_stats():
     """Show stats about software version used by devices."""
     software_query = session.query(Device.software_version,
-                                  func.count(Device.id)) \
-                                .group_by(Device.software_version) \
-                                .order_by(func.count(Device.id).desc())
+                                   func.count(Device.id)) \
+                            .group_by(Device.software_version) \
+                            .order_by(func.count(Device.id).desc())
     print("--- Software version ---")
     for [software_version, count] in software_query.all():
         print("{}: {}".format(software_version, count))
@@ -47,9 +47,9 @@ def software_stats():
 def hardware_stats():
     """Show stats about hardware version used by devices."""
     hardware_query = session.query(Device.hardware_version,
-                                  func.count(Device.id)) \
-                                .group_by(Device.hardware_version) \
-                                .order_by(func.count(Device.id).desc())
+                                   func.count(Device.id)) \
+                            .group_by(Device.hardware_version) \
+                            .order_by(func.count(Device.id).desc())
     print("\n--- Hardware version ---")
     for [hardware_version, count] in hardware_query.all():
         print("{}: {}".format(hardware_version, count))
diff --git a/ogn/gateway/process.py b/ogn/gateway/process.py
index 367fb4b..bfd0464 100644
--- a/ogn/gateway/process.py
+++ b/ogn/gateway/process.py
@@ -2,7 +2,6 @@ import logging
 from ogn.commands.dbutils import session
 from ogn.model import AircraftBeacon, ReceiverBeacon, Device, Receiver, Location
 from ogn.parser import parse_aprs, parse_ogn_receiver_beacon, parse_ogn_aircraft_beacon, ParseError
-from ogn.model.address_origin import AddressOrigin
 
 logger = logging.getLogger(__name__)