From 2a12d020d4d2c29937be6618055a0a017520b56d Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Fri, 23 Sep 2016 04:28:54 -0400
Subject: [PATCH] Removed the unicode future import, moving over to manually
implementing this. Should fix the python2 version, or get us a bit closer.
---
docs/conf.py | 1 -
src/apex/__init__.py | 1 -
src/apex/__main__.py | 1 -
src/apex/aprs/__init__.py | 1 -
src/apex/aprs/aprs_internet_service.py | 1 -
src/apex/aprs/aprs_kiss.py | 1 -
src/apex/aprs/constants.py | 1 -
src/apex/aprs/decimaldegrees.py | 1 -
src/apex/aprs/util.py | 10 +---------
src/apex/cli.py | 1 -
src/apex/kiss/__init__.py | 1 -
src/apex/kiss/constants.py | 1 -
src/apex/kiss/kiss.py | 1 -
src/apex/kiss/util.py | 1 -
src/apex/pluginloader.py | 1 -
src/apex/plugins/apexparadigm/__init__.py | 1 -
src/apex/plugins/beacon/__init__.py | 1 -
src/apex/plugins/id/__init__.py | 1 -
src/apex/plugins/status/__init__.py | 1 -
tests/__init__.py | 1 -
tests/constants.py | 1 -
tests/context.py | 1 -
tests/test_apex.py | 1 -
tests/test_aprs.py | 1 -
tests/test_kiss.py | 1 -
tests/test_kiss_util.py | 1 -
tests/test_util.py | 1 -
27 files changed, 1 insertion(+), 35 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index c2f1ffd..e8016be 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 71c533a..73bb857 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 031c64b..e045f83 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 2b14acb..6f5cc39 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 8dccedf..e9d2320 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 a27520a..063fc3f 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 8df69df..bc55538 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 c298c49..5abc5ca 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 32efb0e..6ae3d80 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 61b0863..f3bc9de 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 638b343..4ced2d3 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 80a7313..9aab5ac 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 57bef79..e7a75f4 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 3ad3205..60b764f 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 646ad36..6f8eca2 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 6de98dc..4981d33 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 1f84ae2..33daf7f 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 b242ab7..1d9a089 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 856dffa..f938623 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 5305e75..b246319 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 d06e0b8..640de7a 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 7aec8b0..19496de 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 693dc2f..3f82e2e 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 0bc728d..94c5cd2 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 076fc39..da519d9 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 af250d8..17560cc 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 4b77a8b..f7bc089 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
--
GitLab