diff --git a/examples/complex/flowbasic.py b/examples/complex/flowbasic.py index 25b0b1a91..dafdd0849 100644 --- a/examples/complex/flowbasic.py +++ b/examples/complex/flowbasic.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ This example shows how to build a proxy based on mitmproxy's Flow primitives. diff --git a/mitmproxy/tools/cmdline.py b/mitmproxy/tools/cmdline.py index 34f1c08f7..1ad521b54 100644 --- a/mitmproxy/tools/cmdline.py +++ b/mitmproxy/tools/cmdline.py @@ -883,21 +883,6 @@ def mitmweb(): action="store_true", dest="wdebug", help="Turn on mitmweb debugging" ) - group.add_argument( - "--wsingleuser", - action="store", dest="wsingleuser", type=str, - metavar="USER", - help=""" - Allows access to a a single user, specified in the form - username:password. - """ - ) - group.add_argument( - "--whtpasswd", - action="store", dest="whtpasswd", type=str, - metavar="PATH", - help="Allow access to users specified in an Apache htpasswd file." - ) common_options(parser) group = parser.add_argument_group( diff --git a/mitmproxy/tools/main.py b/mitmproxy/tools/main.py index 08e5f2cab..69dd3791b 100644 --- a/mitmproxy/tools/main.py +++ b/mitmproxy/tools/main.py @@ -135,8 +135,6 @@ def mitmweb(args=None): # pragma: no cover web_options.wdebug = args.wdebug web_options.wiface = args.wiface web_options.wport = args.wport - web_options.wsingleuser = args.wsingleuser - web_options.whtpasswd = args.whtpasswd web_options.process_web_options(parser) server = process_options(parser, web_options, args)