From 1673dcfd41501ed62bfd81d3e0505b554ccc2f72 Mon Sep 17 00:00:00 2001 From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com> Date: Wed, 28 Sep 2016 14:22:57 -0400 Subject: [PATCH] Cleaned up several of the imports so that the check test is passing again. --- src/apex/__init__.py | 4 +++- src/apex/cli.py | 7 +++++-- src/apex/plugins/apexparadigm/__init__.py | 1 - src/apex/plugins/beacon/__init__.py | 1 - src/apex/plugins/id/__init__.py | 1 - src/apex/util.py | 2 ++ 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/apex/__init__.py b/src/apex/__init__.py index 8907eda..62fb634 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 edc70a0..4bc8abd 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 386aa49..8038772 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 a17bf53..6cd7a24 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 408d0cd..c51c180 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 fb90d14..ab0dc3a 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)) -- GitLab