diff options
author | Maximilian Hils <git@maximilianhils.com> | 2014-09-17 21:14:55 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2014-09-17 21:14:55 +0200 |
commit | 4ca720b55680e40b3a4361141a2ad39f9de81111 (patch) | |
tree | ec50f6a42cd4f1cda7e2f3f6026359adc198ec67 /libmproxy/web/__init__.py | |
parent | 102bd075689892b06765fb857c89604fe9cf33e5 (diff) | |
download | mitmproxy-4ca720b55680e40b3a4361141a2ad39f9de81111.tar.gz mitmproxy-4ca720b55680e40b3a4361141a2ad39f9de81111.tar.bz2 mitmproxy-4ca720b55680e40b3a4361141a2ad39f9de81111.zip |
add features to the traffic table, introduce image spriting
Diffstat (limited to 'libmproxy/web/__init__.py')
-rw-r--r-- | libmproxy/web/__init__.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libmproxy/web/__init__.py b/libmproxy/web/__init__.py index c7e0d20d..69971436 100644 --- a/libmproxy/web/__init__.py +++ b/libmproxy/web/__init__.py @@ -1,8 +1,8 @@ +from __future__ import absolute_import, print_function import tornado.ioloop import tornado.httpserver -from .. import controller, utils, flow, script, proxy -import app -import pprint +from .. import controller, flow +from . import app class Stop(Exception): @@ -59,7 +59,7 @@ class WebMaster(flow.FlowMaster): def __init__(self, server, options): self.options = options self.app = app.Application(self.options.wdebug) - flow.FlowMaster.__init__(self, server, WebState()) + super(WebMaster, self).__init__(server, WebState()) self.last_log_id = 0 @@ -90,7 +90,6 @@ class WebMaster(flow.FlowMaster): return f def handle_response(self, f): - s = f.get_state(True) app.ClientConnection.broadcast("update_flow", f.get_state(True)) flow.FlowMaster.handle_response(self, f) if f: |