diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2018-03-31 19:27:26 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2018-04-01 09:46:32 +1200 |
| commit | 54170ee6572e8ba38b94a4e51f3c8e832e5f9ac7 (patch) | |
| tree | d3599a5d913e8bb37c82718ffe3ccaae46130d1e /mitmproxy/controller.py | |
| parent | d9752c90f97f6ee7f2283ddafe3cde2553230789 (diff) | |
| download | mitmproxy-54170ee6572e8ba38b94a4e51f3c8e832e5f9ac7.tar.gz mitmproxy-54170ee6572e8ba38b94a4e51f3c8e832e5f9ac7.tar.bz2 mitmproxy-54170ee6572e8ba38b94a4e51f3c8e832e5f9ac7.zip | |
asyncio: start a test loop for unit tests
Also move signal handling out of master. These only work in the main thread,
and properly belong in main.py.
Diffstat (limited to 'mitmproxy/controller.py')
| -rw-r--r-- | mitmproxy/controller.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mitmproxy/controller.py b/mitmproxy/controller.py index 834c0040..97fb0f51 100644 --- a/mitmproxy/controller.py +++ b/mitmproxy/controller.py @@ -22,7 +22,7 @@ class Channel: """ m.reply = Reply(m) asyncio.run_coroutine_threadsafe(self._q.put((mtype, m)), self.loop) - g = m.reply._q.get() + g = m.reply.q.get() if g == exceptions.Kill: raise exceptions.Kill() return g |