aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/master.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2018-12-02 11:35:22 +0100
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2018-12-02 15:48:20 +0100
commit2fb2b48a060f53c10958d493415a802c5daf5830 (patch)
tree72c83c34ecd4335625d8b8cfa9169da7569fd3ae /mitmproxy/master.py
parent544f859925865fed4c743f5ff4cc944f444c69e2 (diff)
downloadmitmproxy-2fb2b48a060f53c10958d493415a802c5daf5830.tar.gz
mitmproxy-2fb2b48a060f53c10958d493415a802c5daf5830.tar.bz2
mitmproxy-2fb2b48a060f53c10958d493415a802c5daf5830.zip
bump dependencies
Diffstat (limited to 'mitmproxy/master.py')
-rw-r--r--mitmproxy/master.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mitmproxy/master.py b/mitmproxy/master.py
index ecb8090b..e5683356 100644
--- a/mitmproxy/master.py
+++ b/mitmproxy/master.py
@@ -84,13 +84,14 @@ class Master:
exc = None
try:
loop()
- except Exception as e: # pragma: no cover
+ except Exception: # pragma: no cover
exc = traceback.format_exc()
finally:
if not self.should_exit.is_set(): # pragma: no cover
self.shutdown()
loop = asyncio.get_event_loop()
- for p in asyncio.Task.all_tasks():
+ tasks = asyncio.all_tasks(loop) if sys.version_info >= (3, 7) else asyncio.Task.all_tasks(loop)
+ for p in tasks:
p.cancel()
loop.close()