Skip to content

Commit 041265d

Browse files
semuadminsemuadmin
committed
sort imports using isort, black
1 parent 7246657 commit 041265d

18 files changed

+128
-143
lines changed

‎examples/gnssstreamer_json.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"""
1515

1616
import os
17-
from pygnssutils import GNSSStreamer, FORMAT_JSON
17+
18+
from pygnssutils import FORMAT_JSON, GNSSStreamer
1819

1920
# amend as required...
2021
JSONFILE = os.path.join(os.path.expanduser("~"), "jsonfile.json")

‎examples/gnssstreamer_socket.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
"""
2222

2323
import socket
24-
from pygnssutils import GNSSStreamer, FORMAT_BINARY
24+
25+
from pygnssutils import FORMAT_BINARY, GNSSStreamer
2526

2627
# amend as required...
2728
INPORT = "/dev/tty.usbmodem141101"
@@ -40,7 +41,6 @@
4041
with GNSSStreamer(
4142
port=INPORT, format=FORMAT_BINARY, outputhandler=conn
4243
) as gns:
43-
4444
gns.run()
4545
except (
4646
ConnectionRefusedError,

‎examples/rtk_example.py

+6-10
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,15 @@
4848
# pylint: disable=broad-except
4949

5050
from io import BufferedReader
51-
from threading import Thread, Lock, Event
5251
from queue import Queue
52+
from threading import Event, Lock, Thread
5353
from time import sleep
54-
from serial import Serial
55-
from pyubx2 import (
56-
UBXReader,
57-
NMEA_PROTOCOL,
58-
UBX_PROTOCOL,
59-
RTCM3_PROTOCOL,
60-
protocol,
61-
)
54+
6255
from pyrtcm import RTCM_MSGIDS
63-
from pygnssutils import GNSSNTRIPClient, VERBOSITY_LOW, haversine
56+
from pyubx2 import NMEA_PROTOCOL, RTCM3_PROTOCOL, UBX_PROTOCOL, UBXReader, protocol
57+
from serial import Serial
58+
59+
from pygnssutils import VERBOSITY_LOW, GNSSNTRIPClient, haversine
6460

6561
# Set to True to print entire GNSS/NTRIP message rather than just identity
6662
PRINT_FULL = False

‎examples/tcpserver_threaded.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
:license: BSD 3-Clause
1313
"""
1414

15-
from socketserver import ThreadingTCPServer, StreamRequestHandler
1615
import random
1716

1817
# from serial import Serial
1918
from datetime import datetime, timezone
20-
19+
from socketserver import StreamRequestHandler, ThreadingTCPServer
2120
from time import sleep
22-
from pyubx2 import UBXMessage, GET
21+
2322
from pynmeagps import NMEAMessage
2423
from pyrtcm import RTCMMessage
24+
from pyubx2 import GET, UBXMessage
2525

2626
# amend as required...
2727
BAUD = 9600
@@ -140,7 +140,6 @@ def handle(self):
140140

141141

142142
if __name__ == "__main__":
143-
144143
print(f"Creating TCP server on {HOST}:{PORT}")
145144
server = ThreadingTCPServer((HOST, PORT), TestServer)
146145

‎src/pygnssutils/__init__.py

+6-9
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,15 @@
77
"""
88

99
from pygnssutils._version import __version__
10-
from pygnssutils.exceptions import (
11-
ParameterError,
12-
GNSSStreamError,
13-
)
10+
from pygnssutils.exceptions import GNSSStreamError, ParameterError
11+
from pygnssutils.globals import *
1412
from pygnssutils.gnssdump import GNSSStreamer
15-
from pygnssutils.gnssserver import GNSSSocketServer
16-
from pygnssutils.gnssntripclient import GNSSNTRIPClient
1713
from pygnssutils.gnssmqttclient import GNSSMQTTClient
18-
from pygnssutils.ubxsetrate import UBXSetRate
14+
from pygnssutils.gnssntripclient import GNSSNTRIPClient
15+
from pygnssutils.gnssserver import GNSSSocketServer
16+
from pygnssutils.helpers import *
1917
from pygnssutils.ubxload import UBXLoader
2018
from pygnssutils.ubxsave import UBXSaver
21-
from pygnssutils.helpers import *
22-
from pygnssutils.globals import *
19+
from pygnssutils.ubxsetrate import UBXSetRate
2320

2421
version = __version__ # pylint: disable=invalid-name

‎src/pygnssutils/gnssdump.py

+24-22
Original file line numberDiff line numberDiff line change
@@ -14,45 +14,47 @@
1414
# pylint: disable=line-too-long eval-used
1515

1616
import os
17+
from argparse import ArgumentDefaultsHelpFormatter, ArgumentParser
1718
from collections import defaultdict
18-
from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
19-
from socket import socket
19+
from datetime import datetime
20+
from io import BufferedWriter, TextIOWrapper
2021
from queue import Queue
22+
from socket import socket
2123
from time import time
22-
from datetime import datetime
23-
from io import TextIOWrapper, BufferedWriter
24-
from serial import Serial
24+
25+
import pynmeagps.exceptions as nme
26+
import pyrtcm.exceptions as rte
27+
import pyubx2.exceptions as ube
28+
from pynmeagps import NMEAMessage
29+
from pyrtcm import RTCMMessage
2530
from pyubx2 import (
26-
UBXReader,
27-
UBXMessage,
28-
VALCKSUM,
31+
ERR_LOG,
32+
ERR_RAISE,
2933
GET,
30-
UBX_PROTOCOL,
3134
NMEA_PROTOCOL,
3235
RTCM3_PROTOCOL,
33-
ERR_LOG,
34-
ERR_RAISE,
36+
UBX_PROTOCOL,
37+
VALCKSUM,
38+
UBXMessage,
39+
UBXReader,
3540
hextable,
3641
)
37-
from pynmeagps import NMEAMessage
38-
import pynmeagps.exceptions as nme
39-
import pyubx2.exceptions as ube
40-
from pyrtcm import RTCMMessage
41-
import pyrtcm.exceptions as rte
42+
from serial import Serial
43+
4244
from pygnssutils._version import __version__ as VERSION
4345
from pygnssutils.exceptions import ParameterError
4446
from pygnssutils.globals import (
45-
FORMAT_PARSED,
47+
EPILOG,
4648
FORMAT_BINARY,
4749
FORMAT_HEX,
4850
FORMAT_HEXTABLE,
49-
FORMAT_PARSEDSTRING,
5051
FORMAT_JSON,
51-
VERBOSITY_MEDIUM,
52-
VERBOSITY_HIGH,
53-
VERBOSITY_DEBUG,
52+
FORMAT_PARSED,
53+
FORMAT_PARSEDSTRING,
5454
LOGLIMIT,
55-
EPILOG,
55+
VERBOSITY_DEBUG,
56+
VERBOSITY_HIGH,
57+
VERBOSITY_MEDIUM,
5658
)
5759
from pygnssutils.helpers import format_json
5860

‎src/pygnssutils/gnssmqttclient.py

+19-21
Original file line numberDiff line numberDiff line change
@@ -21,42 +21,40 @@
2121
"""
2222
# pylint: disable=invalid-name
2323

24-
from os import path, getenv
24+
import socket
25+
from argparse import ArgumentDefaultsHelpFormatter, ArgumentParser
26+
from datetime import datetime
27+
from io import BufferedWriter, BytesIO, TextIOWrapper
28+
from os import getenv, path
2529
from pathlib import Path
26-
from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
2730
from queue import Queue
28-
from datetime import datetime
29-
from io import BytesIO, TextIOWrapper, BufferedWriter
31+
from threading import Event, Thread
3032
from time import sleep
31-
from threading import Thread, Event
32-
import socket
33-
from serial import Serial
33+
3434
import paho.mqtt.client as mqtt
35-
from pyubx2 import (
36-
UBXReader,
37-
UBXParseError,
38-
SET,
39-
)
4035
from pyspartn import (
41-
SPARTNReader,
42-
SPARTNParseError,
4336
SPARTNMessageError,
37+
SPARTNParseError,
38+
SPARTNReader,
4439
SPARTNStreamError,
4540
)
41+
from pyubx2 import SET, UBXParseError, UBXReader
42+
from serial import Serial
43+
44+
from pygnssutils._version import __version__ as VERSION
45+
from pygnssutils.exceptions import ParameterError
4646
from pygnssutils.globals import (
47-
VERBOSITY_LOW,
48-
VERBOSITY_MEDIUM,
47+
EPILOG,
4948
LOGLIMIT,
5049
OUTPORT_SPARTN,
51-
EPILOG,
50+
SPARTN_EVENT,
51+
SPARTN_PPSERVER,
5252
TOPIC_IP,
5353
TOPIC_MGA,
5454
TOPIC_RXM,
55-
SPARTN_PPSERVER,
56-
SPARTN_EVENT,
55+
VERBOSITY_LOW,
56+
VERBOSITY_MEDIUM,
5757
)
58-
from pygnssutils.exceptions import ParameterError
59-
from pygnssutils._version import __version__ as VERSION
6058

6159
TIMEOUT = 8
6260

‎src/pygnssutils/gnssntripclient.py

+17-19
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,33 @@
2323
# pylint: disable=invalid-name
2424

2525
import os
26-
from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
27-
from time import sleep
28-
from threading import Thread, Event
29-
from queue import Queue
3026
import socket
31-
from datetime import datetime, timedelta
27+
from argparse import ArgumentDefaultsHelpFormatter, ArgumentParser
3228
from base64 import b64encode
33-
from io import TextIOWrapper, BufferedWriter
29+
from datetime import datetime, timedelta
30+
from io import BufferedWriter, TextIOWrapper
31+
from queue import Queue
32+
from threading import Event, Thread
33+
from time import sleep
34+
35+
from pynmeagps import GET, NMEAMessage
36+
from pyrtcm import RTCMMessageError, RTCMParseError, RTCMTypeError
37+
from pyubx2 import ERR_IGNORE, RTCM3_PROTOCOL, UBXReader
3438
from serial import Serial
35-
from pyubx2 import UBXReader, RTCM3_PROTOCOL, ERR_IGNORE
36-
from pyrtcm import (
37-
RTCMParseError,
38-
RTCMMessageError,
39-
RTCMTypeError,
40-
)
41-
from pynmeagps import NMEAMessage, GET
39+
40+
from pygnssutils._version import __version__ as VERSION
41+
from pygnssutils.exceptions import ParameterError
4242
from pygnssutils.globals import (
43-
VERBOSITY_LOW,
44-
VERBOSITY_MEDIUM,
4543
DEFAULT_BUFSIZE,
44+
EPILOG,
45+
HTTPERR,
4646
LOGLIMIT,
4747
MAXPORT,
4848
NOGGA,
4949
OUTPORT_NTRIP,
50-
HTTPERR,
51-
EPILOG,
50+
VERBOSITY_LOW,
51+
VERBOSITY_MEDIUM,
5252
)
53-
from pygnssutils.exceptions import ParameterError
54-
from pygnssutils._version import __version__ as VERSION
5553
from pygnssutils.helpers import find_mp_distance
5654

5755
TIMEOUT = 10

‎src/pygnssutils/gnssserver.py

+8-7
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,25 @@
1616
# pylint: disable=too-many-arguments
1717

1818
import os
19-
from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
20-
from time import sleep
19+
from argparse import ArgumentDefaultsHelpFormatter, ArgumentParser
2120
from datetime import datetime
2221
from queue import Queue
2322
from threading import Thread
23+
from time import sleep
24+
2425
from pygnssutils._version import __version__ as VERSION
2526
from pygnssutils.globals import (
26-
FORMAT_BINARY,
27-
VERBOSITY_LOW,
28-
VERBOSITY_MEDIUM,
2927
CONNECTED,
28+
EPILOG,
29+
FORMAT_BINARY,
3030
LOGLIMIT,
3131
OUTPORT,
3232
OUTPORT_NTRIP,
33-
EPILOG,
33+
VERBOSITY_LOW,
34+
VERBOSITY_MEDIUM,
3435
)
3536
from pygnssutils.gnssdump import GNSSStreamer
36-
from pygnssutils.socket_server import SocketServer, ClientHandler
37+
from pygnssutils.socket_server import ClientHandler, SocketServer
3738

3839

3940
class GNSSSocketServer:

‎src/pygnssutils/helpers.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"""
1010
# pylint: disable=invalid-name
1111

12-
from math import sin, cos, radians
13-
from pyubx2 import itow2utc
12+
from math import cos, radians, sin
1413

1514
from pynmeagps import haversine
15+
from pyubx2 import itow2utc
1616

1717

1818
def get_mp_distance(lat: float, lon: float, mp: list) -> float:

‎src/pygnssutils/socket_server.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@
2727
:license: BSD 3-Clause
2828
"""
2929

30-
from os import getenv
31-
from socketserver import ThreadingTCPServer, StreamRequestHandler
32-
from threading import Thread, Event
33-
from queue import Queue
3430
from base64 import b64encode
3531
from datetime import datetime, timezone
32+
from os import getenv
33+
from queue import Queue
34+
from socketserver import StreamRequestHandler, ThreadingTCPServer
35+
from threading import Event, Thread
36+
3637
from pygnssutils._version import __version__ as VERSION
37-
from pygnssutils.globals import DISCONNECTED, CONNECTED
38+
from pygnssutils.globals import CONNECTED, DISCONNECTED
3839

3940
# from pygpsclient import version as PYGPSVERSION
4041

‎src/pygnssutils/ubxload.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@
2424
"""
2525
# pylint: disable=invalid-name
2626

27-
from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
28-
from math import ceil
27+
from argparse import ArgumentDefaultsHelpFormatter, ArgumentParser
2928
from datetime import datetime, timedelta
30-
from threading import Thread, Event, Lock
29+
from math import ceil
3130
from queue import Queue
31+
from threading import Event, Lock, Thread
32+
33+
from pyubx2 import SET, UBX_PROTOCOL, UBXMessageError, UBXParseError, UBXReader
3234
from serial import Serial
33-
from pyubx2 import UBXReader, UBX_PROTOCOL, SET, UBXMessageError, UBXParseError
35+
3436
from pygnssutils._version import __version__ as VERSION
3537
from pygnssutils.globals import EPILOG
3638

0 commit comments

Comments
 (0)