diff --git a/setup.py b/setup.py index dd72b71be6cfd18f29f6ff24888826c717d50cc7..210c9f9ab14c00fd59b75d16c09e9b27d152a93f 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,6 @@ # -*- encoding: utf-8 -*- from __future__ import absolute_import from __future__ import print_function - import io import re from glob import glob @@ -10,7 +9,6 @@ from os.path import basename from os.path import dirname from os.path import join from os.path import splitext - from setuptools import find_packages from setuptools import setup diff --git a/src/apex/__init__.py b/src/apex/__init__.py index 266fc110afb3256382f81806584bd266473ae0e4..99d9736e4615ebc1cf6d3cbdea21533e70d5cbd7 100644 --- a/src/apex/__init__.py +++ b/src/apex/__init__.py @@ -1,6 +1,8 @@ # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals __author__ = 'Jeffrey Phillips Freeman (WI2ARD)' __maintainer__ = "Jeffrey Phillips Freeman (WI2ARD)" diff --git a/src/apex/__main__.py b/src/apex/__main__.py index 5078407938b6282f3ff1e0c424e0b99a6373e215..81bfa44c0407989774333f8a76163619ad6206b2 100644 --- a/src/apex/__main__.py +++ b/src/apex/__main__.py @@ -9,8 +9,10 @@ Why does this file exist, and why __main__? For more info, read: - https://docs.python.org/3/using/cmdline.html#cmdoption-m """ # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals from apex.cli import main diff --git a/src/apex/aprs/__init__.py b/src/apex/aprs/__init__.py index 043e6c7c22ddd60f7024505fe548fb52978944bc..6e55b1f898e90a506747b1491b3c9132ba428fb3 100644 --- a/src/apex/aprs/__init__.py +++ b/src/apex/aprs/__init__.py @@ -16,8 +16,10 @@ APRS Python Module. """ # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals import logging diff --git a/src/apex/aprs/aprs_internet_service.py b/src/apex/aprs/aprs_internet_service.py index 03728a65bf1faa63dcd6371964f7259622168b92..f2d3f0d9a410aeec2adc5f30be46e96536272d4c 100644 --- a/src/apex/aprs/aprs_internet_service.py +++ b/src/apex/aprs/aprs_internet_service.py @@ -4,14 +4,18 @@ """APRS Internet Service Class Definitions""" # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals import logging import socket -import requests import time -from apex.aprs import constants as aprsConstants, util as aprsUtil +import requests + +from apex.aprs import constants as aprsConstants +from apex.aprs import util as aprsUtil __author__ = 'Jeffrey Phillips Freeman (WI2ARD)' __maintainer__ = "Jeffrey Phillips Freeman (WI2ARD)" diff --git a/src/apex/aprs/aprs_kiss.py b/src/apex/aprs/aprs_kiss.py index d2e69fd8973084d7e02a440ddb4f31c8603ece36..a27520aa77622013cfd21a4a5c2fa9dba5d53742 100644 --- a/src/apex/aprs/aprs_kiss.py +++ b/src/apex/aprs/aprs_kiss.py @@ -4,8 +4,10 @@ """APRS KISS Class Definitions""" # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals import logging import math diff --git a/src/apex/aprs/constants.py b/src/apex/aprs/constants.py index 4a0974b660a55745a4c0059332239d8f99c20e93..8df69dfd202ac85f32f332021ae18d922ed8be29 100644 --- a/src/apex/aprs/constants.py +++ b/src/apex/aprs/constants.py @@ -6,8 +6,10 @@ Constants for APRS Module. """ # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals import logging diff --git a/src/apex/aprs/decimaldegrees.py b/src/apex/aprs/decimaldegrees.py index 6cbd34412b04e624a24c2eefb0d8df172a456fd9..afe1f7390e0f3f41af4ed16742990d7bde1cfc2a 100644 --- a/src/apex/aprs/decimaldegrees.py +++ b/src/apex/aprs/decimaldegrees.py @@ -49,8 +49,10 @@ $ python decimaldegrees.py [-v] """ # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals import decimal as libdecimal from decimal import Decimal as D diff --git a/src/apex/aprs/util.py b/src/apex/aprs/util.py index ebb294095a072b4a052beba17e2deb78b2c1c7b5..9399d11f2d7309553035fca8c449d25811acb91a 100755 --- a/src/apex/aprs/util.py +++ b/src/apex/aprs/util.py @@ -4,12 +4,14 @@ """Utilities for the APRS Python Module.""" # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals import logging -import unicodedata import sys +import unicodedata import apex.aprs.constants import apex.aprs.decimaldegrees diff --git a/src/apex/cli.py b/src/apex/cli.py index bf38743d768f26d5698c7d17b850d7319c4fb9ef..5d5d18eaecde8560d69b01fea84603b88d3d4a48 100644 --- a/src/apex/cli.py +++ b/src/apex/cli.py @@ -14,20 +14,25 @@ Why does this file exist, and why not put this in __main__? Also see (1) from http://click.pocoo.org/5/setuptools/#setuptools-integration """ + # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals -import click -import time import signal import sys import threading -import cachetools +import time import traceback -from apex.pluginloader import getPlugins, loadPlugin -from apex.kiss import constants as kissConstants +import cachetools +import click + import apex.aprs +from apex.kiss import constants as kissConstants +from apex.pluginloader import getPlugins +from apex.pluginloader import loadPlugin if sys.version_info < (3, 0): import ConfigParser # noqa: F401 diff --git a/src/apex/kiss/__init__.py b/src/apex/kiss/__init__.py index 2332c138d6ab0be724ae4f0e51de291e4e2484ce..638b34307fbc9f0158270c82b69483e32cac9655 100644 --- a/src/apex/kiss/__init__.py +++ b/src/apex/kiss/__init__.py @@ -16,8 +16,10 @@ KISS Python Module. """ # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals import logging from .kiss import Kiss # noqa: F401 diff --git a/src/apex/kiss/constants.py b/src/apex/kiss/constants.py index b0c0cf685f91621c5f33f0852e80066aaa18a9d3..80a7313cca0979e64147bf520d279132c5d295d9 100644 --- a/src/apex/kiss/constants.py +++ b/src/apex/kiss/constants.py @@ -4,8 +4,10 @@ """Constants for KISS Python Module.""" # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals import logging diff --git a/src/apex/kiss/kiss.py b/src/apex/kiss/kiss.py index bdd670980c5753d1183b9115479de2888ef143f2..57bef7934c85f7aeab2e451bbde0859f4b7eb266 100644 --- a/src/apex/kiss/kiss.py +++ b/src/apex/kiss/kiss.py @@ -4,12 +4,15 @@ """KISS Core Classes.""" # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals import logging -import serial import socket +import serial + from apex.kiss import constants as kissConstants __author__ = 'Jeffrey Phillips Freeman (WI2ARD)' diff --git a/src/apex/kiss/util.py b/src/apex/kiss/util.py index 52a0b09c8c56b9ffce4693302b5361022334a2e2..3ad3205307774ec399f5364a6a6a029b3542a23f 100644 --- a/src/apex/kiss/util.py +++ b/src/apex/kiss/util.py @@ -4,8 +4,10 @@ """Utilities for the KISS Python Module.""" # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals import apex.kiss.constants diff --git a/src/apex/pluginloader.py b/src/apex/pluginloader.py index 9209883a0814a24e7f12aa5f89c2743bcd14a5ef..646ad36d1c1f41366cf76bb57467356f262b3667 100644 --- a/src/apex/pluginloader.py +++ b/src/apex/pluginloader.py @@ -1,6 +1,8 @@ # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals import importlib import os diff --git a/src/apex/plugins/apexparadigm/__init__.py b/src/apex/plugins/apexparadigm/__init__.py index 2fb89557facd5961322f73262a331bccffc5a714..bb2d0a0ae96b13d5765bb403309f49ba9905ed5e 100644 --- a/src/apex/plugins/apexparadigm/__init__.py +++ b/src/apex/plugins/apexparadigm/__init__.py @@ -1,12 +1,14 @@ # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division - -import apex.aprs.util +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals import copy import re +import apex.aprs.util + __author__ = 'Jeffrey Phillips Freeman (WI2ARD)' __maintainer__ = "Jeffrey Phillips Freeman (WI2ARD)" __email__ = "jeffrey.freeman@syncleus.com" diff --git a/src/apex/plugins/beacon/__init__.py b/src/apex/plugins/beacon/__init__.py index 93193608128e5dbdbfcd5bf154c01e673d633026..89100523704b6d4e799467ff5f18b6397dd804db 100644 --- a/src/apex/plugins/beacon/__init__.py +++ b/src/apex/plugins/beacon/__init__.py @@ -1,10 +1,13 @@ # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals -import apex.aprs.util import time +import apex.aprs.util + __author__ = 'Jeffrey Phillips Freeman (WI2ARD)' __maintainer__ = "Jeffrey Phillips Freeman (WI2ARD)" __email__ = "jeffrey.freeman@syncleus.com" diff --git a/src/apex/plugins/id/__init__.py b/src/apex/plugins/id/__init__.py index 879efe3379fa166f2e6a575baebcf70b684cc279..21e9a70e0cd6be9a447cdd07fe50659590ec6037 100644 --- a/src/apex/plugins/id/__init__.py +++ b/src/apex/plugins/id/__init__.py @@ -1,10 +1,13 @@ # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals -import apex.aprs.util import time +import apex.aprs.util + __author__ = 'Jeffrey Phillips Freeman (WI2ARD)' __maintainer__ = "Jeffrey Phillips Freeman (WI2ARD)" __email__ = "jeffrey.freeman@syncleus.com" diff --git a/src/apex/plugins/status/__init__.py b/src/apex/plugins/status/__init__.py index 4bdefa51079b7ed51e9881071130e3a09eb71a98..856dffa83b716dca784d24fd2d98dfd306330b56 100644 --- a/src/apex/plugins/status/__init__.py +++ b/src/apex/plugins/status/__init__.py @@ -1,10 +1,13 @@ # These imports are for python3 compatability inside python2 -from __future__ import print_function, unicode_literals -from __future__ import absolute_import, division +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals -import apex.aprs.util import time +import apex.aprs.util + __author__ = 'Jeffrey Phillips Freeman (WI2ARD)' __maintainer__ = "Jeffrey Phillips Freeman (WI2ARD)" __email__ = "jeffrey.freeman@syncleus.com" diff --git a/tests/context.py b/tests/context.py index e8e9bbf50e59d66f5e83650ac2272d76293bc9ee..79cbc3b139c786c3be70ae5adb56bd5d8b35dc11 100644 --- a/tests/context.py +++ b/tests/context.py @@ -11,7 +11,7 @@ __copyright__ = 'Copyright 2016, Syncleus, Inc. and contributors' import os import sys -sys.path.insert(0, os.path.abspath('..')) - import apex.aprs import apex.kiss + +sys.path.insert(0, os.path.abspath('..')) diff --git a/tests/test_apex.py b/tests/test_apex.py index 4f13dee939f48249745dbceabfa9f14906de797c..1413555b536f68550a45ed91f28d3456572d5a17 100644 --- a/tests/test_apex.py +++ b/tests/test_apex.py @@ -1,9 +1,6 @@ - from click.testing import CliRunner - from apex.cli import main - # def test_main(): # runner = CliRunner() # result = runner.invoke(main, []) diff --git a/tests/test_aprs.py b/tests/test_aprs.py index a7bc48adc82c12381c969deb24788d905b816ef0..ac0887b15c1ec79ee7974d1987bfc616ab9eea8d 100644 --- a/tests/test_aprs.py +++ b/tests/test_aprs.py @@ -6,14 +6,13 @@ __license__ = 'Apache License, Version 2.0' __copyright__ = 'Copyright 2016, Syncleus, Inc. and contributors' """Tests for Python APRS-IS Bindings.""" -import apex.aprs.aprs_internet_service - +import logging +import logging.handlers # import httpretty import random import unittest -import logging -import logging.handlers +import apex.aprs.aprs_internet_service import apex.aprs.constants ALPHABET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' diff --git a/tests/test_kiss.py b/tests/test_kiss.py index 286111c28a5adf96da22bd7a64c5eb5cf99270aa..8311aa0443d3b8ebbc60f47a6587a48a0c184cd6 100644 --- a/tests/test_kiss.py +++ b/tests/test_kiss.py @@ -10,11 +10,10 @@ __copyright__ = 'Copyright 2016, Syncleus, Inc. and contributors' import sys import unittest -from . import constants - import apex.kiss import apex.kiss.constants import apex.kiss.util +from . import constants # pylint: disable=R0904,C0103 diff --git a/tests/test_kiss_util.py b/tests/test_kiss_util.py index 1940226db0a1434e1b345fdca2aa9f54efa28114..a25ab69ed125b380d4254929b0055edb728a9073 100644 --- a/tests/test_kiss_util.py +++ b/tests/test_kiss_util.py @@ -10,11 +10,10 @@ __copyright__ = 'Copyright 2016, Syncleus, Inc. and contributors' import sys import unittest -from . import constants - import apex import apex.kiss.constants import apex.kiss.util +from . import constants # pylint: disable=R0904,C0103 diff --git a/tests/test_util.py b/tests/test_util.py index c712a24213494435a05104efb4042e7617648913..9b678592719f2caca2d5125bb3973ec01b69b5a4 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -8,16 +8,14 @@ __license__ = 'Apache License, Version 2.0' __copyright__ = 'Copyright 2016, Syncleus, Inc. and contributors' -import sys -import unittest import logging import logging.handlers +import sys +import unittest -from . import constants - -from apex.aprs import constants as aprsConstants import apex.aprs.util - +from apex.aprs import constants as aprsConstants +from . import constants ALPHABET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' NUMBERS = '0123456789'