aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/optmanager.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-03-08 00:52:37 +0100
committerMaximilian Hils <git@maximilianhils.com>2017-03-08 00:52:37 +0100
commitf276c7a80d63c0a464feca5f76096a23afdc69b2 (patch)
treeb6ea495ce37426e7ae92f1533536011c3dbbadb4 /mitmproxy/optmanager.py
parent8707928b16c3904249309b6c81244359860cf897 (diff)
downloadmitmproxy-f276c7a80d63c0a464feca5f76096a23afdc69b2.tar.gz
mitmproxy-f276c7a80d63c0a464feca5f76096a23afdc69b2.tar.bz2
mitmproxy-f276c7a80d63c0a464feca5f76096a23afdc69b2.zip
change add_option parameter order
name, type, value matches natural language ($x is a bool with a default value of $y) and also matches the python type annotation order of name: type = value
Diffstat (limited to 'mitmproxy/optmanager.py')
-rw-r--r--mitmproxy/optmanager.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/mitmproxy/optmanager.py b/mitmproxy/optmanager.py
index b05e78eb..a928b953 100644
--- a/mitmproxy/optmanager.py
+++ b/mitmproxy/optmanager.py
@@ -26,15 +26,15 @@ class _Option:
def __init__(
self,
name: str,
- default: typing.Any,
typespec: typing.Type,
+ default: typing.Any,
help: str,
choices: typing.Optional[typing.Sequence[str]]
) -> None:
typecheck.check_type(name, default, typespec)
self.name = name
- self._default = default
self.typespec = typespec
+ self._default = default
self.value = unset
self.help = help
self.choices = choices
@@ -71,7 +71,7 @@ class _Option:
def __deepcopy__(self, _):
o = _Option(
- self.name, self.default, self.typespec, self.help, self.choices
+ self.name, self.typespec, self.default, self.help, self.choices
)
if self.has_changed():
o.value = self.current()
@@ -101,14 +101,14 @@ class OptManager:
def add_option(
self,
name: str,
- default: typing.Any,
typespec: typing.Type,
+ default: typing.Any,
help: str,
choices: typing.Optional[typing.Sequence[str]] = None
) -> None:
if name in self._options:
raise ValueError("Option %s already exists" % name)
- self._options[name] = _Option(name, default, typespec, help, choices)
+ self._options[name] = _Option(name, typespec, default, help, choices)
@contextlib.contextmanager
def rollback(self, updated, reraise=False):