(Issue #3) Multiple locations in A-clause should be separated with wh…

…itespace
slavak · Jul 10, 2021 · afaac95 · afaac95
1 parent 6d6ac69
commit afaac95
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/_parser.py b/_parser.py
@@ -20,7 +20,7 @@
     upper_limit = int3
     area_of_effect = ~r"(?P<lat>[0-9]{4}[NS])(?P<long>[0-9]{5}[EW])(?P<radius>[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
@@ -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.)
diff --git 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__':