kopia lustrzana https://github.com/glidernet/python-ogn-client
Replaced deprecated utcnow
rodzic
a6c320c444
commit
6c0828a8c8
|
@ -1,4 +1,4 @@
|
|||
from datetime import datetime
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from ogn.parser.utils import createTimestamp, parseAngle, KNOTS_TO_MS, KPH_TO_MS, FEETS_TO_METER, INCH_TO_MM, fahrenheit_to_celsius, CheapRuler, normalized_quality
|
||||
from ogn.parser.pattern import PATTERN_APRS, PATTERN_APRS_POSITION, PATTERN_APRS_POSITION_WEATHER, PATTERN_APRS_STATUS, PATTERN_SERVER
|
||||
|
@ -27,9 +27,9 @@ def parse(aprs_message, reference_timestamp=None, calculate_relations=False, use
|
|||
global server_timestamp
|
||||
|
||||
if use_server_timestamp is True:
|
||||
reference_timestamp = server_timestamp or datetime.utcnow()
|
||||
reference_timestamp = server_timestamp or datetime.now(timezone.utc)
|
||||
elif reference_timestamp is None:
|
||||
reference_timestamp = datetime.utcnow()
|
||||
reference_timestamp = datetime.now(timezone.utc)
|
||||
|
||||
message = parse_aprs(aprs_message, reference_timestamp=reference_timestamp)
|
||||
if message['aprs_type'] == 'position' or message['aprs_type'] == 'status':
|
||||
|
@ -56,7 +56,7 @@ def parse(aprs_message, reference_timestamp=None, calculate_relations=False, use
|
|||
|
||||
def parse_aprs(message, reference_timestamp=None):
|
||||
if reference_timestamp is None:
|
||||
reference_timestamp = datetime.utcnow()
|
||||
reference_timestamp = datetime.now(timezone.utc)
|
||||
|
||||
result = {'raw_message': message,
|
||||
'reference_timestamp': reference_timestamp}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from datetime import datetime
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from ogn.parser.utils import createTimestamp
|
||||
from ogn.parser.pattern import PATTERN_TELNET_50001
|
||||
|
@ -7,7 +7,7 @@ telnet_50001_pattern = PATTERN_TELNET_50001
|
|||
|
||||
|
||||
def parse(telnet_data):
|
||||
reference_timestamp = datetime.utcnow()
|
||||
reference_timestamp = datetime.now(timezone.utc)
|
||||
|
||||
match = telnet_50001_pattern.match(telnet_data)
|
||||
if match:
|
||||
|
|
|
@ -15,8 +15,8 @@ class TestStringMethods(unittest.TestCase):
|
|||
|
||||
@mock.patch('ogn.parser.telnet_parser.datetime')
|
||||
def test_telnet_parse_complete(self, datetime_mock):
|
||||
# set the utcnow-mock near to the time in the test string
|
||||
datetime_mock.utcnow.return_value = datetime(2015, 1, 1, 10, 0, 55)
|
||||
# set the now-mock near to the time in the test string
|
||||
datetime_mock.now.return_value = datetime(2015, 1, 1, 10, 0, 55)
|
||||
|
||||
message = parse('0.181sec:868.394MHz: 1:2:DDA411 103010: [ +50.86800, +12.15279]deg 988m +0.1m/s 25.7m/s 085.4deg -3.5deg/sec 5 03x04m 01f_-12.61kHz 5.8/15.5dB/2 10e 30.9km 099.5deg +1.1deg + ? R B8949')
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue