diff --git a/src/apex/aprs/decimal_degrees.py b/src/apex/aprs/decimal_degrees.py index e1103b5b1d8ee56dc8e50b4229f5e48996920fb7..6f9be72904cb4fbf7e6f5293582aa71e8f9abc70 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 481ad52791a29139a22ea40e8b010d70e7712bc3..472085f863119a06b1d206799a7b9f7eb45b1888 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): """