From 84b89f25326993645c1fc095ea0b9f9422768ed7 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Tue, 20 Sep 2016 22:04:53 -0400
Subject: [PATCH] Fixed all the isort errors.

---
 setup.py                                  |  2 --
 src/apex/__init__.py                      |  6 ++++--
 src/apex/__main__.py                      |  6 ++++--
 src/apex/aprs/__init__.py                 |  6 ++++--
 src/apex/aprs/aprs_internet_service.py    | 12 ++++++++----
 src/apex/aprs/aprs_kiss.py                |  6 ++++--
 src/apex/aprs/constants.py                |  6 ++++--
 src/apex/aprs/decimaldegrees.py           |  6 ++++--
 src/apex/aprs/util.py                     |  8 +++++---
 src/apex/cli.py                           | 19 ++++++++++++-------
 src/apex/kiss/__init__.py                 |  6 ++++--
 src/apex/kiss/constants.py                |  6 ++++--
 src/apex/kiss/kiss.py                     |  9 ++++++---
 src/apex/kiss/util.py                     |  6 ++++--
 src/apex/pluginloader.py                  |  6 ++++--
 src/apex/plugins/apexparadigm/__init__.py | 10 ++++++----
 src/apex/plugins/beacon/__init__.py       |  9 ++++++---
 src/apex/plugins/id/__init__.py           |  9 ++++++---
 src/apex/plugins/status/__init__.py       |  9 ++++++---
 tests/context.py                          |  4 ++--
 tests/test_apex.py                        |  3 ---
 tests/test_aprs.py                        |  7 +++----
 tests/test_kiss.py                        |  3 +--
 tests/test_kiss_util.py                   |  3 +--
 tests/test_util.py                        | 10 ++++------
 25 files changed, 106 insertions(+), 71 deletions(-)

diff --git a/setup.py b/setup.py
index dd72b71..210c9f9 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 266fc11..99d9736 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 5078407..81bfa44 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 043e6c7..6e55b1f 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 03728a6..f2d3f0d 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 d2e69fd..a27520a 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 4a0974b..8df69df 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 6cbd344..afe1f73 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 ebb2940..9399d11 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 bf38743..5d5d18e 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 2332c13..638b343 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 b0c0cf6..80a7313 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 bdd6709..57bef79 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 52a0b09..3ad3205 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 9209883..646ad36 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 2fb8955..bb2d0a0 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 9319360..8910052 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 879efe3..21e9a70 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 4bdefa5..856dffa 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 e8e9bbf..79cbc3b 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 4f13dee..1413555 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 a7bc48a..ac0887b 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 286111c..8311aa0 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 1940226..a25ab69 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 c712a24..9b67859 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'
-- 
GitLab