From 88886648cf617cadaaf00be9a6bc2ecceff002b0 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Fri, 30 Sep 2016 06:52:57 -0400
Subject: [PATCH] Moved over to using six instead of sys module directly.
---
src/apex/aprs/decimal_degrees.py | 5 +++--
tests/test_aprs.py | 7 ++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/apex/aprs/decimal_degrees.py b/src/apex/aprs/decimal_degrees.py
index e1103b5..6f9be72 100644
--- a/src/apex/aprs/decimal_degrees.py
+++ b/src/apex/aprs/decimal_degrees.py
@@ -54,9 +54,10 @@ from __future__ import division
from __future__ import print_function
import decimal as libdecimal
-import sys
from decimal import Decimal as D
+import six
+
__author__ = 'Jeffrey Phillips Freeman (WI2ARD)'
__maintainer__ = 'Jeffrey Phillips Freeman (WI2ARD)'
__email__ = 'jeffrey.freeman@syncleus.com'
@@ -162,7 +163,7 @@ def dm2decimal(degrees, minutes):
def run_doctest(): # pragma: no cover
"""Runs doctests for this module."""
import doctest
- if sys.version_info < (3, 0):
+ if six.PY2:
import decimaldegrees # pylint: disable=W0406,F0401
return doctest.testmod(decimaldegrees)
diff --git a/tests/test_aprs.py b/tests/test_aprs.py
index 481ad52..472085f 100644
--- a/tests/test_aprs.py
+++ b/tests/test_aprs.py
@@ -8,13 +8,14 @@ from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
-import sys
import unittest
+import six
+
import apex.aprs.constants
import apex.aprs.igate
-if sys.version_info < (3, 0):
+if six.PY2:
import httpretty
__author__ = 'Jeffrey Phillips Freeman (WI2ARD)'
@@ -178,7 +179,7 @@ class AprsTest(unittest.TestCase): # pylint: disable=R0904
full_callsign = apex.aprs.Aprs._Aprs__identity_as_string(callsign)
self.assertEqual(full_callsign, 'W2GMD')
- if sys.version_info < (3, 0):
+ if six.PY2:
@httpretty.httprettified
def test_fake_good_auth(self):
"""
--
GitLab