aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-03-13 01:22:12 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-03-13 01:22:12 +0100
commit1bfc1646924d18f2f13ba71b179480963e11dee9 (patch)
tree6a62c4635c34e2181269b636ecc1c1dbcab579b2 /libmproxy
parent4d9799f1037b46fe610b875bd2dd8aacb8966ec9 (diff)
downloadmitmproxy-1bfc1646924d18f2f13ba71b179480963e11dee9.tar.gz
mitmproxy-1bfc1646924d18f2f13ba71b179480963e11dee9.tar.bz2
mitmproxy-1bfc1646924d18f2f13ba71b179480963e11dee9.zip
adjust tests, fix option handling
Diffstat (limited to 'libmproxy')
-rw-r--r--libmproxy/cmdline.py1
-rw-r--r--libmproxy/proxy/primitives.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py
index 72879155..6c0b1ae8 100644
--- a/libmproxy/cmdline.py
+++ b/libmproxy/cmdline.py
@@ -161,7 +161,6 @@ def get_common_options(options):
anticache = options.anticache,
anticomp = options.anticomp,
client_replay = options.client_replay,
- flow_detail = options.flow_detail,
kill = options.kill,
no_server = options.no_server,
refresh_server_playback = not options.norefresh,
diff --git a/libmproxy/proxy/primitives.py b/libmproxy/proxy/primitives.py
index cbf5b2d8..0fa5273b 100644
--- a/libmproxy/proxy/primitives.py
+++ b/libmproxy/proxy/primitives.py
@@ -67,6 +67,6 @@ class AddressPriority(object):
class Log:
- def __init__(self, msg, level):
+ def __init__(self, msg, level="info"):
self.msg = msg
self.level = level \ No newline at end of file