aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/master.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2017-04-30 22:45:31 +1200
committerAldo Cortesi <aldo@nullcube.com>2017-04-30 22:45:31 +1200
commit685487d33ca07d23c7fd9adc49b6520c9aa19273 (patch)
treed88382737732523c2e468dd3920cd44efd4d983c /mitmproxy/master.py
parenta570caccbda28f19e637231df10b28550e8919af (diff)
downloadmitmproxy-685487d33ca07d23c7fd9adc49b6520c9aa19273.tar.gz
mitmproxy-685487d33ca07d23c7fd9adc49b6520c9aa19273.tar.bz2
mitmproxy-685487d33ca07d23c7fd9adc49b6520c9aa19273.zip
commands: view.order.options, view.marked.toggle, view.create
And use these commands to remove the last hard-coded keybindings from flow list. This means the flow list is now 100% command-driven, which is very exciting.
Diffstat (limited to 'mitmproxy/master.py')
-rw-r--r--mitmproxy/master.py20
1 files changed, 0 insertions, 20 deletions
diff --git a/mitmproxy/master.py b/mitmproxy/master.py
index 2a032c4a..d21a323e 100644
--- a/mitmproxy/master.py
+++ b/mitmproxy/master.py
@@ -7,7 +7,6 @@ from mitmproxy import options
from mitmproxy import controller
from mitmproxy import eventsequence
from mitmproxy import exceptions
-from mitmproxy import connections
from mitmproxy import command
from mitmproxy import http
from mitmproxy import log
@@ -78,9 +77,6 @@ class Master:
self.start()
try:
while not self.should_exit.is_set():
- # Don't choose a very small timeout in Python 2:
- # https://github.com/mitmproxy/mitmproxy/issues/443
- # TODO: Lower the timeout value if we move to Python 3.
self.tick(0.1)
finally:
self.shutdown()
@@ -109,22 +105,6 @@ class Master:
self.should_exit.set()
self.addons.trigger("done")
- def create_request(self, method, url):
- """
- Create a new artificial and minimalist request also adds it to flowlist.
-
- Raises:
- ValueError, if the url is malformed.
- """
- req = http.HTTPRequest.make(method, url)
- c = connections.ClientConnection.make_dummy(("", 0))
- s = connections.ServerConnection.make_dummy((req.host, req.port))
-
- f = http.HTTPFlow(c, s)
- f.request = req
- self.load_flow(f)
- return f
-
def load_flow(self, f):
"""
Loads a flow