From 7dff8f0dca936a58070f6957ab84ca15aa10076a Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 8 Jun 2015 10:58:12 +1200 Subject: Convert parse_websocket_frame to a generator --- libpathod/language/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libpathod/language/__init__.py') diff --git a/libpathod/language/__init__.py b/libpathod/language/__init__.py index 38395b86..c41e8602 100644 --- a/libpathod/language/__init__.py +++ b/libpathod/language/__init__.py @@ -63,12 +63,15 @@ def parse_websocket_frame(s): May raise ParseException """ try: - return websockets.WebsocketFrame.expr().parseString( + reqs = pp.OneOrMore( + websockets.WebsocketFrame.expr() + ).parseString( s, parseAll = True - )[0] + ) except pp.ParseException as v: raise exceptions.ParseException(v.msg, v.line, v.col) + return itertools.chain(*[expand(i) for i in reqs]) def serve(msg, fp, settings): -- cgit v1.2.3