diff --git a/docs/conf.py b/docs/conf.py index c2f1ffd204104ace336fef8b473768f6aa42ea48..e8016beb83e1e39500ea3b8c2e37ff9c55dacec0 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals import os diff --git a/src/apex/__init__.py b/src/apex/__init__.py index 71c533ad0ccbf46e7182fc6ef6d576684d26b208..73bb857dd3d4f28d2f9b95f14e2e1643a865ff77 100644 --- a/src/apex/__init__.py +++ b/src/apex/__init__.py @@ -6,7 +6,6 @@ Main module for APEX refernce implementation application. 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 031c64b1dafd3fda5933fee9685fd0499eefbc2e..e045f8362150fef3a26f65b8510d48e066433a23 100644 --- a/src/apex/__main__.py +++ b/src/apex/__main__.py @@ -13,7 +13,6 @@ Why does this file exist, and why __main__? For more info, read: 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 2b14acbd7ec417cf038c362144928d2761e8f865..6f5cc394a642e096012038455a59ad2df0da1454 100644 --- a/src/apex/aprs/__init__.py +++ b/src/apex/aprs/__init__.py @@ -19,7 +19,6 @@ APRS Python Module. 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 8dccedf1579a88295b17e2fb8d89f4d95d2ef778..e9d2320fe28fd3c997059df550553a78de84a4de 100644 --- a/src/apex/aprs/aprs_internet_service.py +++ b/src/apex/aprs/aprs_internet_service.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from __future__ import unicode_literals import logging import socket diff --git a/src/apex/aprs/aprs_kiss.py b/src/apex/aprs/aprs_kiss.py index a27520aa77622013cfd21a4a5c2fa9dba5d53742..063fc3fc3db7d2eb804f6807df02300216b2d731 100644 --- a/src/apex/aprs/aprs_kiss.py +++ b/src/apex/aprs/aprs_kiss.py @@ -7,7 +7,6 @@ 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 8df69dfd202ac85f32f332021ae18d922ed8be29..bc5553807f2869bcc7d9e91dacdb5219ff64a328 100644 --- a/src/apex/aprs/constants.py +++ b/src/apex/aprs/constants.py @@ -9,7 +9,6 @@ Constants for APRS Module. 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 c298c49a9db4d7226d7fdbd01aaf655479876a88..5abc5ca18e4e86093d476dff4868902060886a7e 100644 --- a/src/apex/aprs/decimaldegrees.py +++ b/src/apex/aprs/decimaldegrees.py @@ -52,7 +52,6 @@ $ python decimaldegrees.py [-v] from __future__ import absolute_import from __future__ import division from __future__ import print_function -from __future__ import unicode_literals import decimal as libdecimal import sys diff --git a/src/apex/aprs/util.py b/src/apex/aprs/util.py index 32efb0e2146bcaef0e8131594c8ae568cf8c6184..6ae3d808a909fd2539a150c4561a7fa78a7cc98e 100755 --- a/src/apex/aprs/util.py +++ b/src/apex/aprs/util.py @@ -7,11 +7,8 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from __future__ import unicode_literals import logging -import sys -import unicodedata import apex.aprs.constants import apex.aprs.decimaldegrees @@ -48,8 +45,6 @@ def dec2dm_lat(dec): suffix = 'N' retval = ''.join([str(abs_deg), "%.2f" % dec_min[1], suffix]) - if sys.version_info < (3, 0): - retval = unicodedata.normalize('NFKD', retval).encode('ascii', 'ignore') return retval @@ -75,8 +70,6 @@ def dec2dm_lng(dec): suffix = 'E' retval = ''.join([str(abs_deg), "%.2f" % dec_min[1], suffix]) - if sys.version_info < (3, 0): - retval = unicodedata.normalize('NFKD', retval).encode('ascii', 'ignore') return retval @@ -138,8 +131,7 @@ def format_aprs_frame(frame): if frame['path']: formatted_frame = ','.join([formatted_frame, format_path(frame['path'])]) formatted_frame += ':' - for frame_byte in bytearray(frame['text'], 'ascii'): - formatted_frame += chr(frame_byte) + formatted_frame += frame['text'] return formatted_frame diff --git a/src/apex/cli.py b/src/apex/cli.py index 61b08636032cd941e2014f3b68c2697728b10f8d..f3bc9dee618bb70a226574eab943aaa701071569 100644 --- a/src/apex/cli.py +++ b/src/apex/cli.py @@ -19,7 +19,6 @@ Why does this file exist, and why not put this in __main__? from __future__ import absolute_import from __future__ import division from __future__ import print_function -from __future__ import unicode_literals import os import signal diff --git a/src/apex/kiss/__init__.py b/src/apex/kiss/__init__.py index 638b34307fbc9f0158270c82b69483e32cac9655..4ced2d35e1908771ac0653f71c9cc1e814fee339 100644 --- a/src/apex/kiss/__init__.py +++ b/src/apex/kiss/__init__.py @@ -19,7 +19,6 @@ KISS Python Module. 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 80a7313cca0979e64147bf520d279132c5d295d9..9aab5ac1b78106b142a50b47fc0409864697156e 100644 --- a/src/apex/kiss/constants.py +++ b/src/apex/kiss/constants.py @@ -7,7 +7,6 @@ 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 57bef7934c85f7aeab2e451bbde0859f4b7eb266..e7a75f4c9e9d5739ce782503340f8a7574c56a7f 100644 --- a/src/apex/kiss/kiss.py +++ b/src/apex/kiss/kiss.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from __future__ import unicode_literals import logging import socket diff --git a/src/apex/kiss/util.py b/src/apex/kiss/util.py index 3ad3205307774ec399f5364a6a6a029b3542a23f..60b764fa4f1794ce6699896955e0efac1457fac9 100644 --- a/src/apex/kiss/util.py +++ b/src/apex/kiss/util.py @@ -7,7 +7,6 @@ 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 646ad36d1c1f41366cf76bb57467356f262b3667..6f8eca22d97fe12bb765d955b2aaa7d20555b72f 100644 --- a/src/apex/pluginloader.py +++ b/src/apex/pluginloader.py @@ -2,7 +2,6 @@ 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 6de98dc793ebca0070b2d6c342fae6c7dd5c5679..4981d335e3f7e0f11da51a1a031504dd5e8d8652 100644 --- a/src/apex/plugins/apexparadigm/__init__.py +++ b/src/apex/plugins/apexparadigm/__init__.py @@ -2,7 +2,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from __future__ import unicode_literals import copy import re diff --git a/src/apex/plugins/beacon/__init__.py b/src/apex/plugins/beacon/__init__.py index 1f84ae292e56f078c53908e789f614bff1003d90..33daf7f4758997415a9fb5e3267fae079711f75e 100644 --- a/src/apex/plugins/beacon/__init__.py +++ b/src/apex/plugins/beacon/__init__.py @@ -2,7 +2,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from __future__ import unicode_literals import time import click diff --git a/src/apex/plugins/id/__init__.py b/src/apex/plugins/id/__init__.py index b242ab7cf1edcc818109c54405e26d07432629cd..1d9a08907fae4e66aa06799e9b3fbb17223fcb33 100644 --- a/src/apex/plugins/id/__init__.py +++ b/src/apex/plugins/id/__init__.py @@ -2,7 +2,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from __future__ import unicode_literals import time import click diff --git a/src/apex/plugins/status/__init__.py b/src/apex/plugins/status/__init__.py index 856dffa83b716dca784d24fd2d98dfd306330b56..f938623f5886f3d7c7e94837739bc0b8778ce8a4 100644 --- a/src/apex/plugins/status/__init__.py +++ b/src/apex/plugins/status/__init__.py @@ -2,7 +2,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from __future__ import unicode_literals import time diff --git a/tests/__init__.py b/tests/__init__.py index 5305e7562076a6014eb9b93223faadb0cc694815..b24631937cde918e8f2cea0fbfcbd384fefb2cae 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -4,7 +4,6 @@ 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/tests/constants.py b/tests/constants.py index d06e0b82300385ade0e5a84bd36337ebccdbefa8..640de7a96b692d05999979a9ae3c98e44213b83f 100644 --- a/tests/constants.py +++ b/tests/constants.py @@ -7,7 +7,6 @@ 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/tests/context.py b/tests/context.py index 7aec8b002de33470e264b789848e9f1bbafe2dda..19496de947933fc2218331eef510c4d94ae81c54 100644 --- a/tests/context.py +++ b/tests/context.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from __future__ import unicode_literals import os import sys diff --git a/tests/test_apex.py b/tests/test_apex.py index 693dc2f8f2f53419fc0be9479381dbfb6d930388..3f82e2ed33fe342eac1ffc4866b149f3a4e9dba2 100644 --- a/tests/test_apex.py +++ b/tests/test_apex.py @@ -2,7 +2,6 @@ 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/tests/test_aprs.py b/tests/test_aprs.py index 0bc728d816c50d8fcced23ede4418f0dcaed74b2..94c5cd2cb73f1d8266565ad7fbd3a14c33b26079 100644 --- a/tests/test_aprs.py +++ b/tests/test_aprs.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from __future__ import unicode_literals import logging import logging.handlers diff --git a/tests/test_kiss.py b/tests/test_kiss.py index 076fc39e0ff8d100563b8b28337cc6ae60b68783..da519d903a29fc33a2df3f8e650fc7d0c63287d7 100644 --- a/tests/test_kiss.py +++ b/tests/test_kiss.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from __future__ import unicode_literals import sys import unittest diff --git a/tests/test_kiss_util.py b/tests/test_kiss_util.py index af250d882440d553634d8ba65288b2b56f050612..17560ccac444bef2ff877b62f979b951c083f443 100644 --- a/tests/test_kiss_util.py +++ b/tests/test_kiss_util.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from __future__ import unicode_literals import unittest diff --git a/tests/test_util.py b/tests/test_util.py index 4b77a8bddd3dec9a988e0bd56117d52dd394e219..f7bc089125bef284332c5eda010726d0e2b216c9 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from __future__ import unicode_literals import logging import logging.handlers