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

Merge pull request #3010 from Kriechi/bump-tornado

Browse Source 
fix Tornado 5.0 event loop
This commit is contained in:
Thomas Kriechbaumer 2018-03-24 11:41:21 +01:00 committed by GitHub
commit 2859ee2fa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -77,7 +77,7 @@ setup(
"pyperclip>=1.6.0, <1.7", "pyperclip>=1.6.0, <1.7",
"ruamel.yaml>=0.13.2, <0.16", "ruamel.yaml>=0.13.2, <0.16",
"sortedcontainers>=1.5.4, <1.6", "sortedcontainers>=1.5.4, <1.6",
"tornado>=4.3, <4.6", "tornado>=4.3,<5.1",
"urwid>=2.0.1,<2.1", "urwid>=2.0.1,<2.1",
"wsproto>=0.11.0,<0.12.0", "wsproto>=0.11.0,<0.12.0",
], ],

4
test/mitmproxy/addons/test_onboarding.py
View File

@ -4,6 +4,10 @@ from mitmproxy.addons import onboarding
from mitmproxy.test import taddons from mitmproxy.test import taddons
from .. import tservers from .. import tservers
import asyncio
import tornado.platform.asyncio
asyncio.set_event_loop_policy(tornado.platform.asyncio.AnyThreadEventLoopPolicy())
class TestApp(tservers.HTTPProxyTest): class TestApp(tservers.HTTPProxyTest):
def addons(self): def addons(self):