diff --git a/src/apex/__init__.py b/src/apex/__init__.py index 8907edad46fb7d642de71ebccdd5744b94466a7a..62fb6348b48c4da4427689162f7e7ef0a8428b7f 100644 --- a/src/apex/__init__.py +++ b/src/apex/__init__.py @@ -7,7 +7,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from .util import * +from .util import echo_colorized_error # noqa: F401 +from .util import echo_colorized_frame # noqa: F401 +from .util import echo_colorized_warning # noqa: F401 __author__ = 'Jeffrey Phillips Freeman (WI2ARD)' __maintainer__ = 'Jeffrey Phillips Freeman (WI2ARD)' diff --git a/src/apex/cli.py b/src/apex/cli.py index edc70a0946f938acc57938fc427505a938ec682c..4bc8abd47f4012adf57ba9d19e4030e768ea5fd1 100644 --- a/src/apex/cli.py +++ b/src/apex/cli.py @@ -30,11 +30,14 @@ import cachetools import click import apex.aprs -from .util import * from apex.kiss import constants as kissConstants from apex.plugin_loader import get_plugins from apex.plugin_loader import load_plugin +from .util import echo_colorized_error +from .util import echo_colorized_frame +from .util import echo_colorized_warning + configparser = None if sys.version_info < (3, 0): import ConfigParser # noqa: F401 @@ -128,7 +131,7 @@ def main(verbose, configfile): kiss_tnc.connect() else: echo_colorized_error('Invalid configuration, value assigned to kiss_init was not recognized: %s' - % kiss_init_string) + % kiss_init_string) return aprs_tnc = apex.aprs.Aprs(data_stream=kiss_tnc) diff --git a/src/apex/plugins/apexparadigm/__init__.py b/src/apex/plugins/apexparadigm/__init__.py index 386aa497b0f7a3bd722e7a4a5b586ca148c1ba72..80387720ff889af8678a09210ca83821c79275f1 100644 --- a/src/apex/plugins/apexparadigm/__init__.py +++ b/src/apex/plugins/apexparadigm/__init__.py @@ -5,7 +5,6 @@ from __future__ import print_function import copy import re -import click import apex import apex.aprs.util diff --git a/src/apex/plugins/beacon/__init__.py b/src/apex/plugins/beacon/__init__.py index a17bf534b53b55e36467fdb130e4cc99b07944c4..6cd7a24de12f0e5236a6c4700d56b80d79a0cfc1 100644 --- a/src/apex/plugins/beacon/__init__.py +++ b/src/apex/plugins/beacon/__init__.py @@ -4,7 +4,6 @@ from __future__ import division from __future__ import print_function import time -import click import apex import apex.aprs.util diff --git a/src/apex/plugins/id/__init__.py b/src/apex/plugins/id/__init__.py index 408d0cdba7eb064d57e00a9d9f8d5b4e130d8b3e..c51c180fe7c96a9aff94375ff19f0269ea61d4e9 100644 --- a/src/apex/plugins/id/__init__.py +++ b/src/apex/plugins/id/__init__.py @@ -4,7 +4,6 @@ from __future__ import division from __future__ import print_function import time -import click import apex import apex.aprs.util diff --git a/src/apex/util.py b/src/apex/util.py index fb90d1495c2e0fc361d1ec1742f369678d632b78..ab0dc3ac147fb27ce5effe85e72bf7dd81baef61 100644 --- a/src/apex/util.py +++ b/src/apex/util.py @@ -21,8 +21,10 @@ def echo_colorized_frame(frame, port_name, direction_in): else: click.echo(click.style(port_name + ' >> ', fg='magenta', bold=True, blink=True) + formatted_aprs) + def echo_colorized_error(text): click.echo(click.style('Error: ', fg='red', bold=True, blink=True) + click.style(text, bold=True)) + def echo_colorized_warning(text): click.echo(click.style('Error: ', fg='yellow') + click.style(text))