Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 02:10:59 +00:00
Code Issues Projects Releases Wiki Activity

downgrade pyparsing to fix #1087 and #1090

Browse Source
This commit is contained in:
Maximilian Hils 2016-04-21 17:11:28 -07:00
parent 49d1bcc8a2
commit 028f5c4929
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -76,7 +76,7 @@ setup(
"passlib>=1.6.5, <1.7", "passlib>=1.6.5, <1.7",
"pyasn1>=0.1.9, <0.2", "pyasn1>=0.1.9, <0.2",
"pyOpenSSL>=16.0, <17.0", "pyOpenSSL>=16.0, <17.0",
"pyparsing>=2.1,<2.2", "pyparsing>=2.0,<2.1", # 2.1.1 breaks our binaries, see https://sourceforge.net/p/pyparsing/bugs/93/
"pyperclip>=1.5.22, <1.6", "pyperclip>=1.5.22, <1.6",
"requests>=2.9.1, <2.10", "requests>=2.9.1, <2.10",
"six>=1.10, <1.11", "six>=1.10, <1.11",

12
test/mitmproxy/test_filt.py
View File

@ -1,8 +1,6 @@
from six.moves import cStringIO as StringIO from six.moves import cStringIO as StringIO
from mitmproxy import filt from mitmproxy import filt
from mitmproxy.models import Error from mock import patch
from mitmproxy.models import http
from netlib.http import Headers
from . import tutils from . import tutils
@ -247,3 +245,11 @@ class TestMatching:
assert self.q("! ~c 201", s) assert self.q("! ~c 201", s)
assert self.q("!~c 201 !~c 202", s) assert self.q("!~c 201 !~c 202", s)
assert not self.q("!~c 201 !~c 200", 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")