renabled ParserErrors when an error file is not in use

phobson · Oct 24, 2012 · 2d7d99e · 2d7d99e
1 parent af5d266
commit 2d7d99e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/metar/Metar.py b/metar/Metar.py
@@ -419,8 +419,8 @@ def __init__(self, metarcode, month=None, year=None,
                 errorfile.write(msg)
             else:
                 print(msg)
-            #raise ParserError(handler.__name__+" failed while processing '"+code+"'\n"+string.join(err.args))
-            #raise err
+                raise ParserError(handler.__name__+" failed while processing '"+code+"'\n"+string.join(err.args))
+                raise err
         if self._unparsed_groups:
             code = ' '.join(self._unparsed_groups)
             msg = "Unparsed groups: '%s' in '%s'\n" % (code, self.code)

diff --git a/parse_metar.py b/parse_metar.py
@@ -12,15 +12,15 @@ def usage():
     program = os.path.basename(sys.argv[0])
     print("Usage: %s [-s] [<file>]" % program)
     options =  """Options:
-  <file> ... a file containing METAR reports to parse
-  -q ....... run "quietly" - just report parsing error.
-  -s ....... run silently. (no output)
-  -p ....... run with profiling turned on.
-This program reads lines containing coded METAR reports from a file
-and prints human-reable reports.  Lines are taken from stdin if no
-file is given.  For testing purposes, the script can run silently,
-reporting only when a METAR report can't be fully parsed.
-"""
+        <file> ... a file containing METAR reports to parse
+        -q ....... run "quietly" - just report parsing error.
+        -s ....... run silently. (no output)
+        -p ....... run with profiling turned on.
+      This program reads lines containing coded METAR reports from a file
+      and prints human-reable reports.  Lines are taken from stdin if no
+      file is given.  For testing purposes, the script can run silently,
+      reporting only when a METAR report can't be fully parsed.
+    """
     print(options)
     sys.exit(1)
 
@@ -36,12 +36,12 @@ def usage():
         if opt[0] == '-s':
             silent = True
             report = False
-         elif opt[0] == '-q':
+        elif opt[0] == '-q':
             report = False
-         elif opt[0] == '-d':
+        elif opt[0] == '-d':
             debug = True
             Metar.debug = True
-         elif opt[0] == '-p':
+        elif opt[0] == '-p':
             prof = True
 except:
   usage()