From 756ac0e337483e910ceb7a91488a78f0ab96844e Mon Sep 17 00:00:00 2001 From: "Fabian P. Schmidt" Date: Thu, 18 Feb 2016 15:49:55 +0100 Subject: [PATCH] Rename module ogn.aprs_utils to 'ogn.parser.utils' --- ogn/model/aircraft_beacon.py | 2 +- ogn/model/beacon.py | 2 +- ogn/{aprs_utils.py => parser/utils.py} | 4 ++-- tests/model/test_aircraft_beacon.py | 2 +- tests/model/test_beacon.py | 2 +- tests/{test_aprs_utils.py => parser/test_utils.py} | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) rename ogn/{aprs_utils.py => parser/utils.py} (93%) rename tests/{test_aprs_utils.py => parser/test_utils.py} (88%) diff --git a/ogn/model/aircraft_beacon.py b/ogn/model/aircraft_beacon.py index 352c1f3..8f4754b 100644 --- a/ogn/model/aircraft_beacon.py +++ b/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 diff --git a/ogn/model/beacon.py b/ogn/model/beacon.py index fd00df5..2818b34 100644 --- a/ogn/model/beacon.py +++ b/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 diff --git a/ogn/aprs_utils.py b/ogn/parser/utils.py similarity index 93% rename from ogn/aprs_utils.py rename to ogn/parser/utils.py index 73f9a48..6bf5478 100644 --- a/ogn/aprs_utils.py +++ b/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 diff --git a/tests/model/test_aircraft_beacon.py b/tests/model/test_aircraft_beacon.py index c0370fd..d9580ab 100644 --- a/tests/model/test_aircraft_beacon.py +++ b/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 diff --git a/tests/model/test_beacon.py b/tests/model/test_beacon.py index ece6a85..a142b90 100644 --- a/tests/model/test_beacon.py +++ b/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 diff --git a/tests/test_aprs_utils.py b/tests/parser/test_utils.py similarity index 88% rename from tests/test_aprs_utils.py rename to tests/parser/test_utils.py index 1ae6930..0647a6f 100644 --- a/tests/test_aprs_utils.py +++ b/tests/parser/test_utils.py @@ -1,8 +1,8 @@ import unittest from datetime import datetime -from ogn.aprs_utils import dmsToDeg, createTimestamp -from ogn.exceptions import AmbigousTimeError +from ogn.parser.utils import dmsToDeg, createTimestamp +from ogn.parser.exceptions import AmbigousTimeError class TestStringMethods(unittest.TestCase):