diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-04-08 12:00:17 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-04-08 12:00:17 +1200 |
| commit | b1d2da19f952ee677ec9c86d13ac2f28db824275 (patch) | |
| tree | a0f918f377226535791fa092631c494f6611642e /libmproxy/main.py | |
| parent | fb0a5d8f6383e689ccfbb498b0b3501dbdf712e2 (diff) | |
| parent | 0aa2fca25aa5511c89653d876a39eec6e812e184 (diff) | |
| download | mitmproxy-b1d2da19f952ee677ec9c86d13ac2f28db824275.tar.gz mitmproxy-b1d2da19f952ee677ec9c86d13ac2f28db824275.tar.bz2 mitmproxy-b1d2da19f952ee677ec9c86d13ac2f28db824275.zip | |
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/main.py')
| -rw-r--r-- | libmproxy/main.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libmproxy/main.py b/libmproxy/main.py index 7d22b48c..7d56a505 100644 --- a/libmproxy/main.py +++ b/libmproxy/main.py @@ -75,14 +75,14 @@ def get_server(dummy_server, options): sys.exit(1) -def mitmproxy(): # pragma: nocover +def mitmproxy(args=None): # pragma: nocover from . import console check_versions() assert_utf8_env() parser = cmdline.mitmproxy() - options = parser.parse_args() + options = parser.parse_args(args) if options.quiet: options.verbose = 0 @@ -102,13 +102,13 @@ def mitmproxy(): # pragma: nocover pass -def mitmdump(): # pragma: nocover +def mitmdump(args=None): # pragma: nocover from . import dump check_versions() parser = cmdline.mitmdump() - options = parser.parse_args() + options = parser.parse_args(args) if options.quiet: options.verbose = 0 options.flow_detail = 0 @@ -136,13 +136,13 @@ def mitmdump(): # pragma: nocover pass -def mitmweb(): # pragma: nocover +def mitmweb(args=None): # pragma: nocover from . import web check_versions() parser = cmdline.mitmweb() - options = parser.parse_args() + options = parser.parse_args(args) if options.quiet: options.verbose = 0 |