Cleanup

ogn/commands/logbook.py

@@ -40,57 +40,49 @@ def show(airport_name, latitude, longitude, altitude):
     # make a query with current, previous and next "takeoff_landing" event, so we can find complete flights
     sq = session.query(
         TakeoffLanding.address,
-        func.lag(TakeoffLanding.address) \
+        func.lag(TakeoffLanding.address)
             .over(
                 order_by=and_(func.date(TakeoffLanding.timestamp),
                               TakeoffLanding.address,
-                              TakeoffLanding.timestamp)) \
+                              TakeoffLanding.timestamp))
             .label('address_prev'),
-        func.lead(TakeoffLanding.address) \
+        func.lead(TakeoffLanding.address)
-            .over(
+            .over(order_by=and_(func.date(TakeoffLanding.timestamp),
-                order_by=and_(func.date(TakeoffLanding.timestamp),
                                 TakeoffLanding.address,
-                              TakeoffLanding.timestamp)) \
+                                TakeoffLanding.timestamp))
             .label('address_next'),
         TakeoffLanding.timestamp,
-       func.lag(
+        func.lag(TakeoffLanding.timestamp)
-           TakeoffLanding.timestamp) \
-               .over(
-                   order_by=and_(func.date(TakeoffLanding.timestamp),
-                                 TakeoffLanding.address,
-                                 TakeoffLanding.timestamp)) \
-               .label('timestamp_prev'),
-       func.lead(
-           TakeoffLanding.timestamp) \
                 .over(order_by=and_(func.date(TakeoffLanding.timestamp),
                                     TakeoffLanding.address,
-                                   TakeoffLanding.timestamp)) \
+                                    TakeoffLanding.timestamp))
+                .label('timestamp_prev'),
+        func.lead(TakeoffLanding.timestamp)
+                .over(order_by=and_(func.date(TakeoffLanding.timestamp),
+                                    TakeoffLanding.address,
+                                    TakeoffLanding.timestamp))
                 .label('timestamp_next'),
         TakeoffLanding.track,
-       func.lag(
+        func.lag(TakeoffLanding.track)
-           TakeoffLanding.track) \
                 .over(order_by=and_(func.date(TakeoffLanding.timestamp),
                                     TakeoffLanding.address,
-                                   TakeoffLanding.timestamp)) \
+                                    TakeoffLanding.timestamp))
                 .label('track_prev'),
-       func.lead(
+        func.lead(TakeoffLanding.track)
-           TakeoffLanding.track) \
                 .over(order_by=and_(func.date(TakeoffLanding.timestamp),
                                     TakeoffLanding.address,
-                                   TakeoffLanding.timestamp)) \
+                                    TakeoffLanding.timestamp))
                 .label('track_next'),
         TakeoffLanding.is_takeoff,
-       func.lag(
+        func.lag(TakeoffLanding.is_takeoff)
-           TakeoffLanding.is_takeoff) \
                 .over(order_by=and_(func.date(TakeoffLanding.timestamp),
                                     TakeoffLanding.address,
-                                   TakeoffLanding.timestamp)) \
+                                    TakeoffLanding.timestamp))
                 .label('is_takeoff_prev'),
-       func.lead(
+        func.lead(TakeoffLanding.is_takeoff)
-           TakeoffLanding.is_takeoff) \
                 .over(order_by=and_(func.date(TakeoffLanding.timestamp),
                                     TakeoffLanding.address,
-                                    TakeoffLanding.timestamp)) \
+                                    TakeoffLanding.timestamp))
                 .label('is_takeoff_next')) \
         .filter(and_(between(TakeoffLanding.latitude, latmin, latmax),
                      between(TakeoffLanding.longitude, lonmin, lonmax))) \

ogn/commands/showdevices.py

@@ -1,4 +1,4 @@
-from ogn.commands.dbutils import engine, session
+from ogn.commands.dbutils import session
 from ogn.model import AddressOrigin, Device
 from sqlalchemy import func, and_, true, false
 

ogn/gateway/client.py

@@ -38,7 +38,7 @@ class ognGateway:
             # close everything
             self.sock.shutdown(0)
             self.sock.close()
-        except OSError as e:
+        except OSError:
             self.logger.error('Socket close error', exc_info=True)
 
     def run(self, callback, autoreconnect=False):

tests/gateway/test_ognGateway.py

@@ -25,5 +25,3 @@ class GatewayTest(unittest.TestCase):
         self.gw.disconnect()
         self.gw.sock.shutdown.assert_called_once_with(0)
         self.gw.sock.close.assert_called_once_with()
-
-