aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-07-13 22:01:16 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-07-13 22:01:16 -0700
commitf84a23f11d869ca5132e0388345bd19937486628 (patch)
treeb8385d356f92d4048aaaa82f6eda1ce86e0b0b91
parentec6fbe9eb684bbf70db796876751078865a0e50f (diff)
downloadmitmproxy-f84a23f11d869ca5132e0388345bd19937486628.tar.gz
mitmproxy-f84a23f11d869ca5132e0388345bd19937486628.tar.bz2
mitmproxy-f84a23f11d869ca5132e0388345bd19937486628.zip
minor fixes
-rw-r--r--mitmproxy/dump.py2
-rw-r--r--mitmproxy/flow/options.py2
-rw-r--r--test/mitmproxy/builtins/test_stream.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/mitmproxy/dump.py b/mitmproxy/dump.py
index 90df6e1b..274e01f3 100644
--- a/mitmproxy/dump.py
+++ b/mitmproxy/dump.py
@@ -7,7 +7,7 @@ import traceback
import click
from typing import Optional # noqa
-import typing
+import typing # noqa
from mitmproxy import contentviews
from mitmproxy import controller
diff --git a/mitmproxy/flow/options.py b/mitmproxy/flow/options.py
index 4bafad0f..eccba5b1 100644
--- a/mitmproxy/flow/options.py
+++ b/mitmproxy/flow/options.py
@@ -31,7 +31,7 @@ class Options(options.Options):
stickyauth=None, # type: Optional[str]
stream_large_bodies=None, # type: Optional[str]
verbosity=1, # type: int
- outfile=None, # type: Optional[str]
+ outfile=None, # type: Tuple[str, str]
replay_ignore_content=False, # type: bool
replay_ignore_params=(), # type: Sequence[str]
replay_ignore_payload_params=(), # type: Sequence[str]
diff --git a/test/mitmproxy/builtins/test_stream.py b/test/mitmproxy/builtins/test_stream.py
index 54e4f7d9..edaa41d2 100644
--- a/test/mitmproxy/builtins/test_stream.py
+++ b/test/mitmproxy/builtins/test_stream.py
@@ -7,7 +7,7 @@ import os.path
from mitmproxy.builtins import stream
from mitmproxy.flow import master, FlowReader
from mitmproxy.flow import state
-from mitmproxy import options
+from mitmproxy.flow import options
class TestStream(mastertest.MasterTest):