From afaac95541403acb45390ca88bbe12caa714b0c1 Mon Sep 17 00:00:00 2001 From: Slava Koyfman Date: Sat, 10 Jul 2021 21:29:09 +0300 Subject: [PATCH] (Issue #3) Multiple locations in A-clause should be separated with whitespace --- _parser.py | 2 +- tests/test_data/A0623_91.txt | 2 +- tests/test_notam.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_parser.py b/_parser.py index b92300e..83aab38 100644 --- a/_parser.py +++ b/_parser.py @@ -20,7 +20,7 @@ upper_limit = int3 area_of_effect = ~r"(?P[0-9]{4}[NS])(?P[0-9]{5}[EW])(?P[0-9]{3})" - a_clause = "A)" _ location_icao ("/" location_icao)* + a_clause = "A)" _ location_icao (" " location_icao)* location_icao = icao_id b_clause = "B)" _ datetime diff --git a/tests/test_data/A0623_91.txt b/tests/test_data/A0623_91.txt index ba3a8bf..1d18002 100644 --- a/tests/test_data/A0623_91.txt +++ b/tests/test_data/A0623_91.txt @@ -1,6 +1,6 @@ (A0623/91 NOTAMN Q) EGXX/QRDCA/IV/NBO/W/000/400/5510N00520W050 -A) EGTT/EGPX B) 9104030730 C) 9104281500 +A) EGTT EGPX B) 9104030730 C) 9104281500 D) APR 03 07 12 21 24 AND 28 0730 TO 1500 E) DANGER AREA DXX IS ACTIVE F) GND G) 12 200 m (40 000 ft) MSL.) \ No newline at end of file diff --git a/tests/test_notam.py b/tests/test_notam.py index acb0fe6..862b14a 100644 --- a/tests/test_notam.py +++ b/tests/test_notam.py @@ -53,7 +53,7 @@ def test_parsed_fields(self): n = notam.Notam.from_str(notam_text) for (field, value) in expected.items(): with self.subTest(msg='Field "{}" of NOTAM "{}"'.format(field, notam_to_test)): - self.assertEquals(getattr(n, field), value) + self.assertEqual(getattr(n, field), value) if __name__ == '__main__':