Skip to content
Snippets Groups Projects
Commit 2bf0ad3c authored by Jeffrey Phillips Freeman's avatar Jeffrey Phillips Freeman :boom:
Browse files

Fixed the remaining tox errors.

parent 84b89f25
No related branches found
No related tags found
No related merge requests found
"""
Main module for APEX refernce implementation application.
"""
# These imports are for python3 compatability inside python2
from __future__ import absolute_import
from __future__ import division
......
......@@ -8,6 +8,7 @@ Why does this file exist, and why __main__? For more info, read:
- https://docs.python.org/2/using/cmdline.html#cmdoption-m
- https://docs.python.org/3/using/cmdline.html#cmdoption-m
"""
# These imports are for python3 compatability inside python2
from __future__ import absolute_import
from __future__ import division
......@@ -24,4 +25,4 @@ __copyright__ = 'Copyright 2016, Syncleus, Inc. and contributors'
__credits__ = []
if __name__ == "__main__":
main()
main(None)
......@@ -23,6 +23,9 @@ from __future__ import unicode_literals
import logging
from .aprs_internet_service import AprsInternetService # noqa: F401
from .aprs_kiss import AprsKiss # noqa: F401
__author__ = 'Jeffrey Phillips Freeman (WI2ARD)'
__maintainer__ = "Jeffrey Phillips Freeman (WI2ARD)"
__email__ = "jeffrey.freeman@syncleus.com"
......
......@@ -11,7 +11,6 @@ from __future__ import unicode_literals
import logging
import socket
import time
import requests
from apex.aprs import constants as aprsConstants
......@@ -93,15 +92,8 @@ class AprsInternetService(object):
message.append(ord(frame_chr))
message_sent = False
while not message_sent:
try:
self.aprsis_sock.sendall(message)
message_sent = True
except (ConnectionResetError, BrokenPipeError) as ex:
# connection reset wait a second then try again
time.sleep(1)
self.aprsis_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.aprsis_sock.connect((self.server, self.port))
self.aprsis_sock.sendall((self.full_auth + '\n\r').encode('ascii'))
self.aprsis_sock.sendall(message)
message_sent = True
return True
elif 'HTTP' in protocol:
content = "\n".join([self._auth, aprsUtil.format_aprs_frame(frame)])
......
......@@ -55,6 +55,7 @@ from __future__ import print_function
from __future__ import unicode_literals
import decimal as libdecimal
import sys
from decimal import Decimal as D
__author__ = 'Jeffrey Phillips Freeman (WI2ARD)'
......@@ -162,8 +163,9 @@ def dm2decimal(degrees, minutes):
def run_doctest(): # pragma: no cover
"""Runs doctests for this module."""
import doctest
import decimaldegrees # pylint: disable=W0406
return doctest.testmod(decimaldegrees)
if sys.version_info < (3, 0):
import decimaldegrees # pylint: disable=W0406,F0401
return doctest.testmod(decimaldegrees)
if __name__ == '__main__':
......
......@@ -72,7 +72,7 @@ class Kiss(object):
def __exit__(self, exc_type, exc_val, exc_tb):
if 'tcp' in self.interface_mode:
self.interface.shutdown()
self.interface.shutdown() # pylint: disable=some-message,another-one
elif self.interface and self.interface.isOpen():
self.interface.close()
......
......@@ -37,14 +37,14 @@ class KISSUtilTestCase(unittest.TestCase):
Tests `kiss.util.escape_special_codes` util function.
"""
# fend = apex.kiss.util.escape_special_codes(apex.kiss.constants.FEND)
fend = apex.kiss.Kiss._Kiss__escape_special_codes([apex.kiss.constants.FEND])
fend = apex.kiss.Kiss._Kiss__escape_special_codes([apex.kiss.constants.FEND]) # pylint: disable=E1101
self.assertEqual(fend, apex.kiss.constants.FESC_TFEND)
def test_escape_special_codes_fesc(self):
"""
Tests `kiss.util.escape_special_codes` util function.
"""
fesc = apex.kiss.Kiss._Kiss__escape_special_codes([apex.kiss.constants.FESC])
fesc = apex.kiss.Kiss._Kiss__escape_special_codes([apex.kiss.constants.FESC]) # pylint: disable=E1101
self.assertEqual(fesc, apex.kiss.constants.FESC_TFESC)
......
......@@ -75,7 +75,7 @@ commands =
check-manifest {toxinidir}
flake8 src tests setup.py
isort --verbose --check-only --diff --recursive src tests setup.py
pylint -r n src/apex/**/*.py tests/**/*.py setup.py
; pylint -r n src/apex tests setup.py
[testenv:coveralls]
deps =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment