allow trailing = in METAR code

akrherz · akrherz · commit fe142f429bb6 · 2019-02-22T11:27:02.000-06:00
closes #84
diff --git a/metar/Metar.py b/metar/Metar.py
@@ -269,6 +269,13 @@ def xlate_loc(loc):
 
 # Helper functions
 
+def _sanitize(code):
+    """Some string prep to improve parsing fidelity."""
+    # Remove extraneous whitespace, any trailing =, then add trailing
+    # whitespace as regex matches need that.
+    return "%s " % (code.strip().rstrip("="), )
+
+
 def _report_match(handler, match):
     """Report success or failure of the given handler function. (DEBUG)"""
     if match:
@@ -366,7 +373,8 @@ def __init__(self, metarcode, month=None, year=None, utcdelta=None,
         self._month = month
         self._year = year
 
-        code = self.code+" "    # (the regexps all expect trailing spaces...)
+        # Do some string prep before parsing
+        code = _sanitize(self.code)
         try:
             ngroup = len(self.handlers)
             igroup = 0
diff --git a/test/test_metar.py b/test/test_metar.py
@@ -39,6 +39,16 @@ def test_module():
     assert hasattr(metar, "__version__")
 
 
+@pytest.mark.parametrize("trailstr", ["", "=", "=  "])
+def test_issue84_trimequals(trailstr):
+    """A trailing = in METAR should not trip up the ingest."""
+    code = (
+        "KABI 031752Z 30010KT 6SM BR FEW009 OVC036 02/01 A3003 RMK AO2 "
+        "SLP176 60001 I%i003 T00170006 10017 21006 56017"
+    )
+    assert Metar.Metar("%s%s" % (code, trailstr)).decode_completed
+
+
 @pytest.mark.parametrize("hours", [1, 3, 6])
 def test_issue77_ice_accretion(hours):
     """Metar parser supports ice accretion data."""
