From bf48ccad4b4b91e7d7e09d1087f5953bc2db97d7 Mon Sep 17 00:00:00 2001 From: Eugene Crosser Date: Fri, 8 Jul 2022 09:36:50 +0200 Subject: [PATCH] Rename gps303proto to zx303proto --- debian/gps303.conf | 2 +- gps303/__main__.py | 2 +- gps303/googlemaps.py | 2 +- gps303/lookaside.py | 2 +- gps303/mkgpx.py | 2 +- gps303/opencellid.py | 2 +- gps303/qry.py | 2 +- gps303/storage.py | 2 +- gps303/termconfig.py | 2 +- gps303/watch.py | 2 +- gps303/wsgateway.py | 2 +- gps303/{gps303proto.py => zx303proto.py} | 0 test/common.py | 2 +- test/test_storage.py | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) rename gps303/{gps303proto.py => zx303proto.py} (100%) diff --git a/debian/gps303.conf b/debian/gps303.conf index 88bf74a..087d5eb 100644 --- a/debian/gps303.conf +++ b/debian/gps303.conf @@ -5,7 +5,7 @@ port = 4303 publishurl = ipc:///var/lib/gps303/collected listenurl = ipc:///var/lib/gps303/responses # comma-separated list of tracker protocols to accept -protocols = gps303proto +protocols = zx303proto [wsgateway] port = 5049 diff --git a/gps303/__main__.py b/gps303/__main__.py index 2ad2ecf..fcd07a6 100644 --- a/gps303/__main__.py +++ b/gps303/__main__.py @@ -10,7 +10,7 @@ from typing import List, Tuple import zmq from . import common -from .gps303proto import * +from .zx303proto import * from .zmsg import Bcast, Resp log = getLogger("gps303") diff --git a/gps303/googlemaps.py b/gps303/googlemaps.py index dac6079..418523d 100644 --- a/gps303/googlemaps.py +++ b/gps303/googlemaps.py @@ -51,7 +51,7 @@ if __name__.endswith("__main__"): from datetime import datetime, timezone from sqlite3 import connect import sys - from .gps303proto import * + from .zx303proto import * db = connect(sys.argv[1]) c = db.cursor() diff --git a/gps303/lookaside.py b/gps303/lookaside.py index 0c1e4cd..2e759d1 100644 --- a/gps303/lookaside.py +++ b/gps303/lookaside.py @@ -9,7 +9,7 @@ from struct import pack import zmq from . import common -from .gps303proto import parse_message, proto_name, WIFI_POSITIONING +from .zx303proto import parse_message, proto_name, WIFI_POSITIONING from .zmsg import Bcast, Resp, topic log = getLogger("gps303/lookaside") diff --git a/gps303/mkgpx.py b/gps303/mkgpx.py index 456b94f..02a0825 100644 --- a/gps303/mkgpx.py +++ b/gps303/mkgpx.py @@ -8,7 +8,7 @@ from datetime import datetime, timezone from sqlite3 import connect import sys -from .gps303proto import * +from .zx303proto import * db = connect(sys.argv[1]) c = db.cursor() diff --git a/gps303/opencellid.py b/gps303/opencellid.py index 7b6e413..583d2e1 100644 --- a/gps303/opencellid.py +++ b/gps303/opencellid.py @@ -57,7 +57,7 @@ def lookup( if __name__.endswith("__main__"): from datetime import datetime, timezone import sys - from .gps303proto import * + from .zx303proto import * db = connect(sys.argv[1]) c = db.cursor() diff --git a/gps303/qry.py b/gps303/qry.py index 25f55aa..cde47ec 100644 --- a/gps303/qry.py +++ b/gps303/qry.py @@ -2,7 +2,7 @@ from datetime import datetime, timezone from sqlite3 import connect import sys -from .gps303proto import parse_message, proto_by_name +from .zx303proto import parse_message, proto_by_name db = connect(sys.argv[1]) c = db.cursor() diff --git a/gps303/storage.py b/gps303/storage.py index c0fc89b..c9ac603 100644 --- a/gps303/storage.py +++ b/gps303/storage.py @@ -7,7 +7,7 @@ import zmq from . import common from .evstore import initdb, stow -from .gps303proto import proto_of_message +from .zx303proto import proto_of_message from .zmsg import Bcast log = getLogger("gps303/storage") diff --git a/gps303/termconfig.py b/gps303/termconfig.py index 6ec43fd..4599dc2 100644 --- a/gps303/termconfig.py +++ b/gps303/termconfig.py @@ -7,7 +7,7 @@ from struct import pack import zmq from . import common -from .gps303proto import * +from .zx303proto import * from .zmsg import Bcast, Resp, topic log = getLogger("gps303/termconfig") diff --git a/gps303/watch.py b/gps303/watch.py index e66689e..098209c 100644 --- a/gps303/watch.py +++ b/gps303/watch.py @@ -6,7 +6,7 @@ from logging import getLogger import zmq from . import common -from .gps303proto import parse_message +from .zx303proto import parse_message from .zmsg import Bcast log = getLogger("gps303/watch") diff --git a/gps303/wsgateway.py b/gps303/wsgateway.py index 80fdac7..7dc2fcd 100644 --- a/gps303/wsgateway.py +++ b/gps303/wsgateway.py @@ -22,7 +22,7 @@ import zmq from . import common from .evstore import initdb, fetch -from .gps303proto import ( +from .zx303proto import ( GPS_POSITIONING, STATUS, WIFI_POSITIONING, diff --git a/gps303/gps303proto.py b/gps303/zx303proto.py similarity index 100% rename from gps303/gps303proto.py rename to gps303/zx303proto.py diff --git a/test/common.py b/test/common.py index ba4c12a..3bf8f08 100644 --- a/test/common.py +++ b/test/common.py @@ -43,7 +43,7 @@ class TestWithServers(TestCase): "port": str(freeports[0]), "publishurl": "ipc://" + self.tmpfilebase + ".pub", "listenurl": "ipc://" + self.tmpfilebase + ".pul", - "protocols": "gps303proto", + "protocols": "zx303proto", } self.conf["storage"] = { "dbfn": self.tmpfilebase + ".storage.sqlite", diff --git a/test/test_storage.py b/test/test_storage.py index 1747737..869ab18 100644 --- a/test/test_storage.py +++ b/test/test_storage.py @@ -7,7 +7,7 @@ from time import sleep from typing import Any import unittest from .common import send_and_drain, TestWithServers -from gps303.gps303proto import * +from gps303.zx303proto import * from gps303.ocid_dload import SCHEMA -- 2.43.0