aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/options.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-08-16 22:52:02 +0200
committerGitHub <noreply@github.com>2017-08-16 22:52:02 +0200
commita006cab5cee773c60355660b4b44b702b4d51321 (patch)
treebca3caa8bb035bf3cadd70d48d0b3af85537f9bd /mitmproxy/options.py
parent7c650aa53bc947207b2fcd0cbf195ba83a64252e (diff)
parent56781a0b08a0453fef0ff3f34d06c41c378cd7bc (diff)
downloadmitmproxy-a006cab5cee773c60355660b4b44b702b4d51321.tar.gz
mitmproxy-a006cab5cee773c60355660b4b44b702b4d51321.tar.bz2
mitmproxy-a006cab5cee773c60355660b4b44b702b4d51321.zip
Merge pull request #2489 from MatthewShao/options-into-own-addon
Move console-related options into their own addon
Diffstat (limited to 'mitmproxy/options.py')
-rw-r--r--mitmproxy/options.py60
1 files changed, 0 insertions, 60 deletions
diff --git a/mitmproxy/options.py b/mitmproxy/options.py
index 1ecdd6a6..b008e588 100644
--- a/mitmproxy/options.py
+++ b/mitmproxy/options.py
@@ -4,29 +4,6 @@ from mitmproxy import optmanager
from mitmproxy import contentviews
from mitmproxy.net import tcp
-# We redefine these here for now to avoid importing Urwid-related guff on
-# platforms that don't support it, and circular imports. We can do better using
-# a lazy checker down the track.
-console_palettes = [
- "lowlight",
- "lowdark",
- "light",
- "dark",
- "solarized_light",
- "solarized_dark"
-]
-view_orders = [
- "time",
- "method",
- "url",
- "size",
-]
-console_layouts = [
- "single",
- "vertical",
- "horizontal",
-]
-
log_verbosity = [
"error",
"warn",
@@ -475,43 +452,6 @@ class Options(optmanager.OptManager):
"Intercept filter expression."
)
- # Console options
- self.add_option(
- "console_layout", str, "single",
- "Console layout.",
- choices=sorted(console_layouts),
- )
- self.add_option(
- "console_layout_headers", bool, True,
- "Show layout comonent headers",
- )
- self.add_option(
- "console_focus_follow", bool, False,
- "Focus follows new flows."
- )
- self.add_option(
- "console_palette", str, "solarized_dark",
- "Color palette.",
- choices=sorted(console_palettes),
- )
- self.add_option(
- "console_palette_transparent", bool, False,
- "Set transparent background for palette."
- )
- self.add_option(
- "console_mouse", bool, True,
- "Console mouse interaction."
- )
- self.add_option(
- "console_order", str, "time",
- "Flow sort order.",
- choices=view_orders,
- )
- self.add_option(
- "console_order_reversed", bool, False,
- "Reverse the sorting order."
- )
-
self.add_option(
"view_filter", Optional[str], None,
"Limit which flows are displayed."