From 9fda74c65a632bda5176e2ccafbbcab2af27d77d Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 4 Jun 2015 17:18:06 +1200 Subject: Clarify language API, stub out nested websocket frames --- libpathod/language/__init__.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'libpathod/language/__init__.py') diff --git a/libpathod/language/__init__.py b/libpathod/language/__init__.py index 3cc7dfbe..e2e3e57d 100644 --- a/libpathod/language/__init__.py +++ b/libpathod/language/__init__.py @@ -9,7 +9,7 @@ from base import Settings assert Settings # prevent pyflakes from messing with this -def parse_response(s): +def parse_pathod(s): """ May raise ParseException """ @@ -18,12 +18,17 @@ def parse_response(s): except UnicodeError: raise exceptions.ParseException("Spec must be valid ASCII.", 0, 0) try: - return http.Response.expr().parseString(s, parseAll=True)[0] + return pp.Or( + [ + websockets.WebsocketFrame.expr(), + http.Response.expr(), + ] + ).parseString(s, parseAll=True)[0] except pp.ParseException as v: raise exceptions.ParseException(v.msg, v.line, v.col) -def parse_requests(s): +def parse_pathoc(s): """ May raise ParseException """ -- cgit v1.2.3