Rename module ogn.aprs_utils to 'ogn.parser.utils'

ogn/model/aircraft_beacon.py

@@ -2,7 +2,7 @@ import re
 
 from sqlalchemy import Column, String, Integer, Float, Boolean, SmallInteger
 
-from ogn.aprs_utils import fpm2ms
+from ogn.parser.utils import fpm2ms
 from .beacon import Beacon
 from ogn.exceptions import OgnParseError
 

ogn/model/beacon.py

@@ -4,7 +4,7 @@ from datetime import datetime
 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.parser.utils import createTimestamp, dmsToDeg, kts2kmh, feet2m
 from ogn.exceptions import AprsParseError
 from .base import Base
 

ogn/parser/utils.py

@@ -1,7 +1,7 @@
-from datetime import datetime, timedelta
 import math
+from datetime import datetime, timedelta
 
-from ogn.exceptions import AmbigousTimeError
+from ogn.parser.exceptions import AmbigousTimeError
 
 
 kmh2kts = 0.539957

tests/model/test_aircraft_beacon.py

@@ -2,7 +2,7 @@ import unittest
 
 from datetime import datetime
 
-from ogn.aprs_utils import ms2fpm
+from ogn.parser.utils import ms2fpm
 from ogn.model import Beacon, AircraftBeacon
 from ogn.exceptions import OgnParseError
 

tests/model/test_beacon.py

@@ -2,7 +2,7 @@ import unittest
 
 from datetime import datetime
 
-from ogn.aprs_utils import dmsToDeg, kts2kmh, m2feet
+from ogn.parser.utils import dmsToDeg, kts2kmh, m2feet
 from ogn.model import Beacon
 from ogn.exceptions import AprsParseError
 

tests/parser/test_utils.py

@@ -1,8 +1,8 @@
 import unittest
 from datetime import datetime
 
-from ogn.aprs_utils import dmsToDeg, createTimestamp
+from ogn.parser.utils import dmsToDeg, createTimestamp
-from ogn.exceptions import AmbigousTimeError
+from ogn.parser.exceptions import AmbigousTimeError
 
 
 class TestStringMethods(unittest.TestCase):