Cleanups: remove intercept from addons.state, unused imports

mitmproxy/addons/state.py

@@ -180,9 +180,6 @@ class State:
         self.flows = FlowStore()
         self.view = FlowView(self.flows, None)
 
-        # These are compiled filter expressions:
-        self.intercept = None
-
     @property
     def filter_txt(self):
         return getattr(self.view.filter, "pattern", None)
@@ -231,19 +228,6 @@ class State:
             self.view._close()
             self.view = FlowView(self.flows, None)
 
-    def set_intercept(self, txt):
-        if txt:
-            flt = flowfilter.parse(txt)
-            if not flt:
-                return "Invalid filter expression."
-            self.intercept = flt
-        else:
-            self.intercept = None
-
-    @property
-    def intercept_txt(self):
-        return getattr(self.intercept, "pattern", None)
-
     def clear(self):
         self.flows._clear()
 

test/mitmproxy/addons/test_anticache.py

@@ -1,6 +1,6 @@
 from mitmproxy.test import tflow
 
-from .. import tutils, mastertest
+from .. import mastertest
 from mitmproxy.addons import anticache
 from mitmproxy import master
 from mitmproxy import options

test/mitmproxy/addons/test_anticomp.py

@@ -1,6 +1,6 @@
 from mitmproxy.test import tflow
 
-from .. import tutils, mastertest
+from .. import mastertest
 from mitmproxy.addons import anticomp
 from mitmproxy import master
 from mitmproxy import options

test/mitmproxy/addons/test_clientplayback.py

@@ -4,7 +4,7 @@ import mock
 from mitmproxy.addons import clientplayback
 from mitmproxy import options
 
-from .. import tutils, mastertest
+from .. import mastertest
 
 
 class TestClientPlayback:

test/mitmproxy/addons/test_dumper.py

@@ -1,7 +1,7 @@
 import io
 from mitmproxy.test import tflow
 
-from .. import tutils, mastertest
+from .. import mastertest
 
 from mitmproxy.addons import dumper
 from mitmproxy import exceptions

test/mitmproxy/addons/test_serverplayback.py

@@ -1,6 +1,6 @@
 from mitmproxy.test import tflow
 
-from .. import tutils, mastertest
+from .. import mastertest
 
 import mitmproxy.test.tutils
 from mitmproxy.addons import serverplayback

test/mitmproxy/addons/test_state.py

@@ -3,8 +3,6 @@ from mitmproxy import proxy
 from mitmproxy import master
 from mitmproxy.addons import state
 
-from .. import tutils
-
 
 class TestState:
     def test_duplicate_flow(self):

test/mitmproxy/addons/test_stickyauth.py

@@ -1,6 +1,6 @@
 from mitmproxy.test import tflow
 
-from .. import tutils, mastertest
+from .. import mastertest
 from mitmproxy.addons import stickyauth
 from mitmproxy import master
 from mitmproxy import options

test/mitmproxy/addons/test_streambodies.py

@@ -1,6 +1,6 @@
 from mitmproxy.test import tflow
 
-from .. import tutils, mastertest
+from .. import mastertest
 from mitmproxy import master
 from mitmproxy import options
 from mitmproxy import proxy

test/mitmproxy/console/test_master.py

@@ -6,7 +6,7 @@ from mitmproxy.tools import console
 from mitmproxy import proxy
 from mitmproxy.tools.console import common
 
-from .. import tutils, mastertest
+from .. import mastertest
 
 
 class TestConsoleState:

test/mitmproxy/mastertest.py

@@ -2,7 +2,6 @@ import contextlib
 
 from mitmproxy.test import tflow
 
-from . import tutils
 import mitmproxy.test.tutils
 
 from mitmproxy import master

test/mitmproxy/protocol/test_http1.py

@@ -2,7 +2,7 @@ from mitmproxy.test import tflow
 from mitmproxy.net.http import http1
 from mitmproxy.net.tcp import TCPClient
 from mitmproxy.test.tutils import treq
-from .. import tutils, tservers
+from .. import tservers
 
 
 class TestHTTPFlow:

test/mitmproxy/test_flow.py

@@ -268,14 +268,6 @@ class TestState:
 
         assert "Invalid" in c.set_view_filter("~")
 
-    def test_set_intercept(self):
-        c = state.State()
-        assert not c.set_intercept("~q")
-        assert c.intercept_txt == "~q"
-        assert "Invalid" in c.set_intercept("~")
-        assert not c.set_intercept(None)
-        assert c.intercept_txt is None
-
     def _add_request(self, state):
         f = tflow.tflow()
         state.add_flow(f)