From 21573ae829c3cc0d516f7e03c56106a198111f7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Fri, 30 Oct 2015 21:19:03 +0100
Subject: [PATCH] Cosmetics

---
 ogn/aprs_parser.py    | 6 +++---
 ogn/db_utils.py       | 8 ++++----
 ogn/model/beacon.py   | 2 +-
 ogn/model/flarm.py    | 4 ++--
 ogn/model/position.py | 2 +-
 ogn/model/receiver.py | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ogn/aprs_parser.py b/ogn/aprs_parser.py
index aebd43d..160d17d 100644
--- a/ogn/aprs_parser.py
+++ b/ogn/aprs_parser.py
@@ -1,6 +1,6 @@
-from ogn.model.beacon import Beacon
-from ogn.model.position import Position
-from ogn.model.receiver import Receiver
+from .model.beacon import Beacon
+from .model.position import Position
+from .model.receiver import Receiver
 
 
 def parse_aprs(text):
diff --git a/ogn/db_utils.py b/ogn/db_utils.py
index d31f900..72e42d7 100644
--- a/ogn/db_utils.py
+++ b/ogn/db_utils.py
@@ -1,8 +1,8 @@
 from urllib.request import urlopen
 
-from ogn.db import session
-from ogn.model.address_origin import AddressOrigin
-from ogn.model.flarm import *
+from .db import session
+from .model.address_origin import AddressOrigin
+from .model.flarm import Flarm
 
 
 def get_devices_from_ddb():
@@ -27,7 +27,7 @@ def get_devices_from_flarmnet():
     response = urlopen("http://flarmnet.org/files/data.fln")
     lines = response.readlines()
     for line in lines:
-        if (len(line) != FLARMNET_LINE_LENGTH):
+        if (len(line) != Flarm.FLARMNET_LINE_LENGTH):
             continue
 
         flarm = Flarm()
diff --git a/ogn/model/beacon.py b/ogn/model/beacon.py
index 200d29d..4d14955 100644
--- a/ogn/model/beacon.py
+++ b/ogn/model/beacon.py
@@ -4,7 +4,7 @@ from sqlalchemy import Column, String, Integer, Float, DateTime
 from sqlalchemy.ext.declarative import AbstractConcreteBase
 
 from ogn.aprs_utils import createTimestamp, dmsToDeg, kts2kmh, feet2m
-from ogn.model.base import Base
+from .base import Base
 
 
 # "original" pattern from OGN: "(.+?)>APRS,.+,(.+?):/(\\d{6})+h(\\d{4}\\.\\d{2})(N|S).(\\d{5}\\.\\d{2})(E|W).((\\d{3})/(\\d{3}))?/A=(\\d{6}).*?"
diff --git a/ogn/model/flarm.py b/ogn/model/flarm.py
index 1aa7603..3b44fd2 100644
--- a/ogn/model/flarm.py
+++ b/ogn/model/flarm.py
@@ -2,8 +2,8 @@ import re
 
 from sqlalchemy import Column, Integer, String, Unicode, Boolean, SmallInteger
 
-from ogn.model.address_origin import *
-from ogn.model.base import Base
+from .address_origin import AddressOrigin
+from .base import Base
 
 
 FLARMNET_LINE_LENGTH = 173
diff --git a/ogn/model/position.py b/ogn/model/position.py
index c7fde93..58094a1 100644
--- a/ogn/model/position.py
+++ b/ogn/model/position.py
@@ -3,7 +3,7 @@ import re
 from sqlalchemy import Column, String, Integer, Float, Boolean, SmallInteger
 
 from ogn.aprs_utils import fpm2ms
-from ogn.model.beacon import Beacon
+from .beacon import Beacon
 
 
 class Position(Beacon):
diff --git a/ogn/model/receiver.py b/ogn/model/receiver.py
index 19cfc75..1000665 100644
--- a/ogn/model/receiver.py
+++ b/ogn/model/receiver.py
@@ -2,7 +2,7 @@ import re
 
 from sqlalchemy import Column, String
 
-from ogn.model.beacon import Beacon
+from .beacon import Beacon
 
 
 class Receiver(Beacon):