aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/flow.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2014-09-10 11:34:58 +1200
committerAldo Cortesi <aldo@nullcube.com>2014-09-10 11:34:58 +1200
commit76982937a68a2adaf96ec2d258e369d7c871a609 (patch)
tree46453bc432035ea5f4405351563529de65ea0ba3 /libmproxy/flow.py
parente5412e9dd91c37a3f43f68441985b857d29cbbb4 (diff)
downloadmitmproxy-76982937a68a2adaf96ec2d258e369d7c871a609.tar.gz
mitmproxy-76982937a68a2adaf96ec2d258e369d7c871a609.tar.bz2
mitmproxy-76982937a68a2adaf96ec2d258e369d7c871a609.zip
Reorg to put web app in its own directory
Diffstat (limited to 'libmproxy/flow.py')
-rw-r--r--libmproxy/flow.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index d263ccdd..c4cbb36a 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -9,7 +9,8 @@ import flask
import requests
from netlib import odict, wsgi
import netlib.http
-from . import controller, protocol, tnetstring, filt, script, version, app
+from . import controller, protocol, tnetstring, filt, script, version
+from .web import app
from .protocol import http, handle
from .proxy.config import parse_host_pattern
@@ -727,7 +728,7 @@ class FlowMaster(controller.Master):
self.stream_large_bodies.run(f, False)
f.reply()
- return f
+ return f
def handle_response(self, f):
self.state.add_response(f)