Skip to content
Snippets Groups Projects
Commit c1f5e2ea authored by Bruce Flynn's avatar Bruce Flynn
Browse files

Fix _make_frames

parent 84f20276
No related branches found
No related tags found
No related merge requests found
...@@ -57,16 +57,17 @@ class LineParseError(Exception): ...@@ -57,16 +57,17 @@ class LineParseError(Exception):
def _make_frame(data): def _make_frame(data):
"""Construct a frame from a list of tuples. """Construct a frame from a list of tuples.
""" """
frame = {}
for key, value in data: for key, value in data:
if key == 'stamp': if key == 'stamp':
continue continue
if key in database: if key in database:
try: try:
data[key] = database[key].type(data[key]) frame[key] = database[key].type(value)
except (ValueError, TypeError): except (ValueError, TypeError):
raise LineParseError("error converting '%s' using %s", raise LineParseError("error converting '%s' using %s",
data[key], database[key].type) value, database[key].type)
return data return frame
class ParserV0(object): class ParserV0(object):
...@@ -169,7 +170,7 @@ def read_frames(source, error_handler=lambda *a: None): ...@@ -169,7 +170,7 @@ def read_frames(source, error_handler=lambda *a: None):
for parser in [ParserV1V2(), ParserV0()]: for parser in [ParserV1V2(), ParserV0()]:
if parser.maybe_mine(line): if parser.maybe_mine(line):
try: try:
yield parser.parse(line) yield parser.make_frame(line)
except LineParseError as err: except LineParseError as err:
error_handler(idx + 1, line, err) error_handler(idx + 1, line, err)
break break
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment