From 028f5c4929a8775d5211d4f73c0d52808dccbf6b Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Thu, 21 Apr 2016 17:11:28 -0700 Subject: downgrade pyparsing to fix #1087 and #1090 --- test/mitmproxy/test_filt.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/mitmproxy/test_filt.py b/test/mitmproxy/test_filt.py index 4401f2be..9fe36b2a 100644 --- a/test/mitmproxy/test_filt.py +++ b/test/mitmproxy/test_filt.py @@ -1,8 +1,6 @@ from six.moves import cStringIO as StringIO from mitmproxy import filt -from mitmproxy.models import Error -from mitmproxy.models import http -from netlib.http import Headers +from mock import patch from . import tutils @@ -247,3 +245,11 @@ class TestMatching: assert self.q("! ~c 201", s) assert self.q("!~c 201 !~c 202", s) assert not self.q("!~c 201 !~c 200", s) + + +@patch('traceback.extract_tb') +def test_pyparsing_bug(extract_tb): + """https://github.com/mitmproxy/mitmproxy/issues/1087""" + # The text is a string with leading and trailing whitespace stripped; if the source is not available it is None. + extract_tb.return_value = [("", 1, "test", None)] + assert filt.parse("test") -- cgit v1.2.3