From a62843920a6742cf22c966e6d2a05155f20aeb17 Mon Sep 17 00:00:00 2001 From: Hemna Date: Thu, 7 Jul 2022 10:47:34 -0400 Subject: [PATCH] Moved trace.py to utils This patch moves trace.py to the utils directory --- aprsd/client.py | 3 ++- aprsd/cmds/dev.py | 3 ++- aprsd/cmds/listen.py | 5 ++--- aprsd/cmds/server.py | 3 ++- aprsd/plugins/email.py | 3 ++- aprsd/plugins/fortune.py | 3 ++- aprsd/plugins/location.py | 3 ++- aprsd/plugins/notify.py | 3 ++- aprsd/plugins/ping.py | 3 ++- aprsd/plugins/query.py | 3 ++- aprsd/plugins/time.py | 4 ++-- aprsd/plugins/version.py | 3 ++- aprsd/plugins/weather.py | 3 ++- aprsd/{ => utils}/trace.py | 0 14 files changed, 26 insertions(+), 16 deletions(-) rename aprsd/{ => utils}/trace.py (100%) diff --git a/aprsd/client.py b/aprsd/client.py index 06dc1cd..b4cb2e3 100644 --- a/aprsd/client.py +++ b/aprsd/client.py @@ -6,8 +6,9 @@ import aprslib from aprslib.exceptions import LoginError from aprsd import config as aprsd_config -from aprsd import exception, trace +from aprsd import exception from aprsd.clients import aprsis, kiss +from aprsd.utils import trace LOG = logging.getLogger("APRSD") diff --git a/aprsd/cmds/dev.py b/aprsd/cmds/dev.py index 383ffcf..bbe1e59 100644 --- a/aprsd/cmds/dev.py +++ b/aprsd/cmds/dev.py @@ -8,8 +8,9 @@ import logging import click # local imports here -from aprsd import cli_helper, client, messaging, packets, plugin, stats, trace +from aprsd import cli_helper, client, messaging, packets, plugin, stats from aprsd.aprsd import cli +from aprsd.utils import trace LOG = logging.getLogger("APRSD") diff --git a/aprsd/cmds/listen.py b/aprsd/cmds/listen.py index c3ebe27..c165650 100644 --- a/aprsd/cmds/listen.py +++ b/aprsd/cmds/listen.py @@ -14,10 +14,9 @@ from rich.console import Console # local imports here import aprsd -from aprsd import ( - cli_helper, client, messaging, packets, stats, threads, trace, utils, -) +from aprsd import cli_helper, client, messaging, packets, stats, threads, utils from aprsd.aprsd import cli +from aprsd.utils import trace # setup the global logger diff --git a/aprsd/cmds/server.py b/aprsd/cmds/server.py index b173bdb..7d9a8cf 100644 --- a/aprsd/cmds/server.py +++ b/aprsd/cmds/server.py @@ -7,10 +7,11 @@ import click import aprsd from aprsd import ( cli_helper, client, flask, messaging, packets, plugin, stats, threads, - trace, utils, + utils, ) from aprsd import aprsd as aprsd_main from aprsd.aprsd import cli +from aprsd.utils import trace LOG = logging.getLogger("APRSD") diff --git a/aprsd/plugins/email.py b/aprsd/plugins/email.py index d734e06..c5b0430 100644 --- a/aprsd/plugins/email.py +++ b/aprsd/plugins/email.py @@ -11,7 +11,8 @@ import time import imapclient from validate_email import validate_email -from aprsd import messaging, plugin, stats, threads, trace +from aprsd import messaging, plugin, stats, threads +from aprsd.utils import trace LOG = logging.getLogger("APRSD") diff --git a/aprsd/plugins/fortune.py b/aprsd/plugins/fortune.py index b30fc73..43ff0a7 100644 --- a/aprsd/plugins/fortune.py +++ b/aprsd/plugins/fortune.py @@ -2,7 +2,8 @@ import logging import shutil import subprocess -from aprsd import plugin, trace +from aprsd import plugin +from aprsd.utils import trace LOG = logging.getLogger("APRSD") diff --git a/aprsd/plugins/location.py b/aprsd/plugins/location.py index 939661b..ddc97ef 100644 --- a/aprsd/plugins/location.py +++ b/aprsd/plugins/location.py @@ -2,7 +2,8 @@ import logging import re import time -from aprsd import plugin, plugin_utils, trace +from aprsd import plugin, plugin_utils +from aprsd.utils import trace LOG = logging.getLogger("APRSD") diff --git a/aprsd/plugins/notify.py b/aprsd/plugins/notify.py index 09e4a20..878a40f 100644 --- a/aprsd/plugins/notify.py +++ b/aprsd/plugins/notify.py @@ -1,6 +1,7 @@ import logging -from aprsd import messaging, packets, plugin, trace +from aprsd import messaging, packets, plugin +from aprsd.utils import trace LOG = logging.getLogger("APRSD") diff --git a/aprsd/plugins/ping.py b/aprsd/plugins/ping.py index b709574..6304a45 100644 --- a/aprsd/plugins/ping.py +++ b/aprsd/plugins/ping.py @@ -1,7 +1,8 @@ import logging import time -from aprsd import plugin, trace +from aprsd import plugin +from aprsd.utils import trace LOG = logging.getLogger("APRSD") diff --git a/aprsd/plugins/query.py b/aprsd/plugins/query.py index bdc273a..a21062e 100644 --- a/aprsd/plugins/query.py +++ b/aprsd/plugins/query.py @@ -2,7 +2,8 @@ import datetime import logging import re -from aprsd import messaging, plugin, trace +from aprsd import messaging, plugin +from aprsd.utils import trace LOG = logging.getLogger("APRSD") diff --git a/aprsd/plugins/time.py b/aprsd/plugins/time.py index 92033c9..e446eb2 100644 --- a/aprsd/plugins/time.py +++ b/aprsd/plugins/time.py @@ -5,8 +5,8 @@ import time from opencage.geocoder import OpenCageGeocode import pytz -from aprsd import plugin, plugin_utils, trace -from aprsd.utils import fuzzy +from aprsd import plugin, plugin_utils +from aprsd.utils import fuzzy, trace LOG = logging.getLogger("APRSD") diff --git a/aprsd/plugins/version.py b/aprsd/plugins/version.py index 6a05690..80ce257 100644 --- a/aprsd/plugins/version.py +++ b/aprsd/plugins/version.py @@ -1,7 +1,8 @@ import logging import aprsd -from aprsd import plugin, stats, trace +from aprsd import plugin, stats +from aprsd.utils import trace LOG = logging.getLogger("APRSD") diff --git a/aprsd/plugins/weather.py b/aprsd/plugins/weather.py index 1880fef..acf1208 100644 --- a/aprsd/plugins/weather.py +++ b/aprsd/plugins/weather.py @@ -4,7 +4,8 @@ import re import requests -from aprsd import plugin, plugin_utils, trace +from aprsd import plugin, plugin_utils +from aprsd.utils import trace LOG = logging.getLogger("APRSD") diff --git a/aprsd/trace.py b/aprsd/utils/trace.py similarity index 100% rename from aprsd/trace.py rename to aprsd/utils/trace.py