Move function 'create_aprs_login' to ogn.gateway

ogn/aprs_utils.py

@@ -33,10 +33,3 @@ def createTimestamp(hhmmss, reference):
         raise AmbigousTimeError(reference, packet_time)
 
     return timestamp
-
-
-def create_aprs_login(user_name, pass_code, app_name, app_version, aprs_filter=None):
-    if not aprs_filter:
-        return "user %s pass %s vers %s %s\n" % (user_name, pass_code, app_name, app_version)
-    else:
-        return "user %s pass %s vers %s %s filter %s\n" % (user_name, pass_code, app_name, app_version, aprs_filter)

ogn/gateway/client.py

@@ -4,10 +4,16 @@ from time import time
 
 from ogn.gateway import settings
 from ogn.aprs_parser import parse_aprs
-from ogn.aprs_utils import create_aprs_login
 from ogn.exceptions import AprsParseError, OgnParseError, AmbigousTimeError
 
 
+def create_aprs_login(user_name, pass_code, app_name, app_version, aprs_filter=None):
+    if not aprs_filter:
+        return "user {} pass {} vers {} {}\n".format(user_name, pass_code, app_name, app_version)
+    else:
+        return "user {} pass {} vers {} {} filter {}\n".format(user_name, pass_code, app_name, app_version, aprs_filter)
+
+
 class ognGateway:
     def __init__(self, aprs_user, aprs_filter=''):
         self.logger = logging.getLogger(__name__)

tests/gateway/test_ognGateway.py

@@ -1,11 +1,18 @@
 import unittest
 import unittest.mock as mock
 
-from ogn.gateway.client import ognGateway
+from ogn.gateway.client import create_aprs_login, ognGateway
 from ogn.gateway.settings import APRS_APP_NAME, APRS_APP_VER
 
 
 class GatewayTest(unittest.TestCase):
+    def test_create_aprs_login(self):
+        basic_login = create_aprs_login('klaus', -1, 'myApp', '0.1')
+        self.assertEqual('user klaus pass -1 vers myApp 0.1\n', basic_login)
+
+        login_with_filter = create_aprs_login('klaus', -1, 'myApp', '0.1', 'r/48.0/11.0/100')
+        self.assertEqual('user klaus pass -1 vers myApp 0.1 filter r/48.0/11.0/100\n', login_with_filter)
+
     def test_initialisation(self):
         self.gw = ognGateway(aprs_user='testuser', aprs_filter='')
         self.assertEqual(self.gw.aprs_user, 'testuser')

tests/test_aprs_utils.py

@@ -1,7 +1,7 @@
 import unittest
 from datetime import datetime
 
-from ogn.aprs_utils import dmsToDeg, createTimestamp, create_aprs_login
+from ogn.aprs_utils import dmsToDeg, createTimestamp
 from ogn.exceptions import AmbigousTimeError
 
 
@@ -22,13 +22,6 @@ class TestStringMethods(unittest.TestCase):
         with self.assertRaises(AmbigousTimeError):
             createTimestamp('123456', reference=datetime(2015, 10, 15, 23, 59, 59))
 
-    def test_create_aprs_login(self):
-        basic_login = create_aprs_login('klaus', -1, 'myApp', '0.1')
-        self.assertEqual('user klaus pass -1 vers myApp 0.1\n', basic_login)
-
-        login_with_filter = create_aprs_login('klaus', -1, 'myApp', '0.1', 'r/48.0/11.0/100')
-        self.assertEqual('user klaus pass -1 vers myApp 0.1 filter r/48.0/11.0/100\n', login_with_filter)
-
 
 if __name__ == '__main__':
     unittest.main()