Skip to content

Commit f88eaa0

Browse files
committed
chore: use raw strings for regular expressions
Use fully qualified datetime.time to avoid confusion
1 parent dc1fa98 commit f88eaa0

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

metar_taf_parser/command/remark.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ def can_parse(self, code: str) -> any:
516516

517517

518518
class TornadicActivityBegCommand(Command):
519-
regex = '^(TORNADO|FUNNEL CLOUD|WATERSPOUT) (B(\d{2})?(\d{2}))( (\d+)? ([A-Z]{1,2})?)?'
519+
regex = r'^(TORNADO|FUNNEL CLOUD|WATERSPOUT) (B(\d{2})?(\d{2}))( (\d+)? ([A-Z]{1,2})?)?'
520520

521521
def __init__(self):
522522
self._pattern = re.compile(TornadicActivityBegCommand.regex)

metar_taf_parser/model/model.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import abc
2-
from datetime import time
2+
import datetime
33

44
from metar_taf_parser.model.enum import Descriptive, Flag, WeatherChangeType, TimeIndicator, IcingIntensity, TurbulenceIntensity
55

@@ -537,7 +537,7 @@ def _set_day(self, value: int):
537537
def _get_time(self):
538538
return self._time
539539

540-
def _set_time(self, value: time):
540+
def _set_time(self, value: datetime.time):
541541
self._time = value
542542

543543
def _get_message(self):
@@ -717,7 +717,7 @@ def _get_type(self):
717717
def _get_time(self):
718718
return self._time
719719

720-
def _set_time(self, value: time):
720+
def _set_time(self, value: datetime.time):
721721
self._time = value
722722

723723
def __repr__(self):

metar_taf_parser/parser/parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ def _extract_lines_tokens(self, taf_code: str):
313313
"""
314314
single_line = taf_code.replace('\n', ' ')
315315
clean_line = re.sub(r'\s{2,}', ' ', single_line)
316-
lines = re.sub(r'\s(PROB\d{2}\sTEMPO|TEMPO|INTER|BECMG|FM(?![A-Z]{2}\s)|PROB)', '\n\g<1>', clean_line).splitlines()
316+
lines = re.sub(r'\s(PROB\d{2}\sTEMPO|TEMPO|INTER|BECMG|FM(?![A-Z]{2}\s)|PROB)', r'\n\g<1>', clean_line).splitlines()
317317
lines_token = [self.tokenize(line) for line in lines]
318318

319319
if len(lines_token) > 1:

0 commit comments

Comments
 (0)