aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/master.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2017-02-09 11:56:38 +0100
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2017-02-09 16:08:36 +0100
commit0299bb5b2e4870363ba0c402c6cf15722ca0ee0f (patch)
treef3f893401505dd57931497645e4015a2e0ec7aae /mitmproxy/master.py
parent5a3976c43e480b3926691e9f394b8200ca7613f0 (diff)
downloadmitmproxy-0299bb5b2e4870363ba0c402c6cf15722ca0ee0f.tar.gz
mitmproxy-0299bb5b2e4870363ba0c402c6cf15722ca0ee0f.tar.bz2
mitmproxy-0299bb5b2e4870363ba0c402c6cf15722ca0ee0f.zip
eventsequence: coverage++
Diffstat (limited to 'mitmproxy/master.py')
-rw-r--r--mitmproxy/master.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mitmproxy/master.py b/mitmproxy/master.py
index ee240eeb..3a3f4399 100644
--- a/mitmproxy/master.py
+++ b/mitmproxy/master.py
@@ -7,7 +7,7 @@ import sys
from mitmproxy import addonmanager
from mitmproxy import options
from mitmproxy import controller
-from mitmproxy import events
+from mitmproxy import eventsequence
from mitmproxy import exceptions
from mitmproxy import connections
from mitmproxy import http
@@ -91,7 +91,7 @@ class Master:
changed = False
try:
mtype, obj = self.event_queue.get(timeout=timeout)
- if mtype not in events.Events:
+ if mtype not in eventsequence.Events:
raise exceptions.ControlException(
"Unknown event %s" % repr(mtype)
)
@@ -153,7 +153,7 @@ class Master:
f.request.port = self.server.config.upstream_server.address.port
f.request.scheme = self.server.config.upstream_server.scheme
f.reply = controller.DummyReply()
- for e, o in events.event_sequence(f):
+ for e, o in eventsequence.iterate(f):
getattr(self, e)(o)
def load_flows(self, fr: io.FlowReader) -> int: