diff options
| author | Aldo Cortesi <aldo@corte.si> | 2017-03-16 15:51:21 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 15:51:21 +1300 |
| commit | 1e6c51c69831679681b964c2f431ad578a30d475 (patch) | |
| tree | 3301af21683545f35bcd83a09e360eee08286793 /mitmproxy/tools/web/master.py | |
| parent | dadefaecdba902d60767736152470ff25c4147fe (diff) | |
| parent | 228a22b3c044b23bd75e4558778722bf3f44cf24 (diff) | |
| download | mitmproxy-1e6c51c69831679681b964c2f431ad578a30d475.tar.gz mitmproxy-1e6c51c69831679681b964c2f431ad578a30d475.tar.bz2 mitmproxy-1e6c51c69831679681b964c2f431ad578a30d475.zip | |
Merge pull request #2152 from cortesi/readfile
Extract flow reading into addons
Diffstat (limited to 'mitmproxy/tools/web/master.py')
| -rw-r--r-- | mitmproxy/tools/web/master.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/mitmproxy/tools/web/master.py b/mitmproxy/tools/web/master.py index 8c7f579d..e28bd002 100644 --- a/mitmproxy/tools/web/master.py +++ b/mitmproxy/tools/web/master.py @@ -3,7 +3,6 @@ import webbrowser import tornado.httpserver import tornado.ioloop from mitmproxy import addons -from mitmproxy import exceptions from mitmproxy import log from mitmproxy import master from mitmproxy.addons import eventstore @@ -42,14 +41,6 @@ class WebMaster(master.Master): ) # This line is just for type hinting self.options = self.options # type: Options - if options.rfile: - try: - self.load_flows_file(options.rfile) - except exceptions.FlowReadException as v: - self.add_log( - "Could not read flow file: %s" % v, - "error" - ) def _sig_view_add(self, view, flow): app.ClientConnection.broadcast( |