Reorg to put web app in its own directory

nderkach · Sep 9, 2014 · 7698293 · 7698293
1 parent e5412e9
commit 7698293
Show file tree

Hide file tree

Showing 20 changed files with 4 additions and 3 deletions.
diff --git a/libmproxy/flow.py b/libmproxy/flow.py
@@ -9,7 +9,8 @@
 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 @@ def handle_responseheaders(self, f):
             self.stream_large_bodies.run(f, False)
 
         f.reply()
-        return f        
+        return f
 
     def handle_response(self, f):
         self.state.add_response(f)

diff --git a/libmproxy/web/__init__.py b/libmproxy/web/__init__.py
diff --git a/libmproxy/app.py → libmproxy/web/app.py b/libmproxy/app.py → libmproxy/web/app.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 import flask
 import os
-from .proxy import config
+from ..proxy import config
 
 mapp = flask.Flask(__name__)
 mapp.debug = True

diff --git a/libmproxy/static/bootstrap.min.css → libmproxy/web/static/bootstrap.min.css b/libmproxy/static/bootstrap.min.css → libmproxy/web/static/bootstrap.min.css
diff --git a/libmproxy/static/bootstrap.min.js → libmproxy/web/static/bootstrap.min.js b/libmproxy/static/bootstrap.min.js → libmproxy/web/static/bootstrap.min.js
diff --git a/...y/static/fontawesome/css/font-awesome.css → ...b/static/fontawesome/css/font-awesome.css b/...y/static/fontawesome/css/font-awesome.css → ...b/static/fontawesome/css/font-awesome.css
diff --git a/...atic/fontawesome/css/font-awesome.min.css → ...atic/fontawesome/css/font-awesome.min.css b/...atic/fontawesome/css/font-awesome.min.css → ...atic/fontawesome/css/font-awesome.min.css
diff --git a/.../static/fontawesome/fonts/FontAwesome.otf → .../static/fontawesome/fonts/FontAwesome.otf b/.../static/fontawesome/fonts/FontAwesome.otf → .../static/fontawesome/fonts/FontAwesome.otf
diff --git a/...fontawesome/fonts/fontawesome-webfont.eot → ...fontawesome/fonts/fontawesome-webfont.eot b/...fontawesome/fonts/fontawesome-webfont.eot → ...fontawesome/fonts/fontawesome-webfont.eot
diff --git a/...fontawesome/fonts/fontawesome-webfont.svg → ...fontawesome/fonts/fontawesome-webfont.svg b/...fontawesome/fonts/fontawesome-webfont.svg → ...fontawesome/fonts/fontawesome-webfont.svg
diff --git a/...fontawesome/fonts/fontawesome-webfont.ttf → ...fontawesome/fonts/fontawesome-webfont.ttf b/...fontawesome/fonts/fontawesome-webfont.ttf → ...fontawesome/fonts/fontawesome-webfont.ttf
diff --git a/...ontawesome/fonts/fontawesome-webfont.woff → ...ontawesome/fonts/fontawesome-webfont.woff b/...ontawesome/fonts/fontawesome-webfont.woff → ...ontawesome/fonts/fontawesome-webfont.woff
diff --git a/libmproxy/static/jquery-1.10.1.min.js → libmproxy/web/static/jquery-1.10.1.min.js b/libmproxy/static/jquery-1.10.1.min.js → libmproxy/web/static/jquery-1.10.1.min.js
diff --git a/libmproxy/static/jquery.localscroll-min.js → ...roxy/web/static/jquery.localscroll-min.js b/libmproxy/static/jquery.localscroll-min.js → ...roxy/web/static/jquery.localscroll-min.js
diff --git a/libmproxy/static/jquery.scrollTo-min.js → libmproxy/web/static/jquery.scrollTo-min.js b/libmproxy/static/jquery.scrollTo-min.js → libmproxy/web/static/jquery.scrollTo-min.js
diff --git a/libmproxy/static/mitmproxy.css → libmproxy/web/static/mitmproxy.css b/libmproxy/static/mitmproxy.css → libmproxy/web/static/mitmproxy.css
diff --git a/libmproxy/templates/certs.html → libmproxy/web/templates/certs.html b/libmproxy/templates/certs.html → libmproxy/web/templates/certs.html
diff --git a/libmproxy/templates/frame.html → libmproxy/web/templates/frame.html b/libmproxy/templates/frame.html → libmproxy/web/templates/frame.html
diff --git a/libmproxy/templates/index.html → libmproxy/web/templates/index.html b/libmproxy/templates/index.html → libmproxy/web/templates/index.html
diff --git a/libmproxy/templates/layout.html → libmproxy/web/templates/layout.html b/libmproxy/templates/layout.html → libmproxy/web/templates/layout.html