aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-07-02 15:49:37 +0200
committerGitHub <noreply@github.com>2016-07-02 15:49:37 +0200
commitf70fd1b4b6204195ad85669abe8d275a0e97fdf2 (patch)
treefc3b1425ae5c4354e7750c937b0cae7e1ea8f294
parent2c09e0416bcf94d9ebef7c11bb1883388e8e2c5d (diff)
parent393c1d74afaaed908ea842a7cf804e15a121e7fd (diff)
downloadmitmproxy-f70fd1b4b6204195ad85669abe8d275a0e97fdf2.tar.gz
mitmproxy-f70fd1b4b6204195ad85669abe8d275a0e97fdf2.tar.bz2
mitmproxy-f70fd1b4b6204195ad85669abe8d275a0e97fdf2.zip
Merge pull request #1308 from dufferzafar/lint-hotfix
fix lint issues
-rw-r--r--mitmproxy/flow/master.py1
-rw-r--r--test/mitmproxy/tservers.py2
2 files changed, 0 insertions, 3 deletions
diff --git a/mitmproxy/flow/master.py b/mitmproxy/flow/master.py
index efb5d013..520f82e9 100644
--- a/mitmproxy/flow/master.py
+++ b/mitmproxy/flow/master.py
@@ -16,7 +16,6 @@ from mitmproxy.flow import modules
from mitmproxy.onboarding import app
from mitmproxy.protocol import http_replay
from mitmproxy.proxy.config import HostMatcher
-from netlib import strutils
class FlowMaster(controller.Master):
diff --git a/test/mitmproxy/tservers.py b/test/mitmproxy/tservers.py
index 51f4b4e2..0760cb53 100644
--- a/test/mitmproxy/tservers.py
+++ b/test/mitmproxy/tservers.py
@@ -11,8 +11,6 @@ import pathod.pathoc
from mitmproxy import flow, controller
from mitmproxy.cmdline import APP_HOST, APP_PORT
-from netlib import strutils
-
testapp = flask.Flask(__name__)