Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity

Remove -T and -U command-line options.

Browse Source 
They're redundant convenience options, and we need more space.
This commit is contained in:
Aldo Cortesi 2012-06-26 19:56:47 +12:00
parent 015a74fd14
commit 8ccfb376f3
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libmproxy/cmdline.py
View File

@ -73,14 +73,10 @@ def parse_replace_hook(s):
def get_common_options(options): def get_common_options(options):
stickycookie, stickyauth = None, None stickycookie, stickyauth = None, None
if options.stickycookie_all: if options.stickycookie_filt:
stickycookie = ".*"
elif options.stickycookie_filt:
stickycookie = options.stickycookie_filt stickycookie = options.stickycookie_filt
if options.stickyauth_all: if options.stickyauth_filt:
stickyauth = ".*"
elif options.stickyauth_filt:
stickyauth = options.stickyauth_filt stickyauth = options.stickyauth_filt
reps = [] reps = []
@ -175,21 +171,11 @@ def common_options(parser):
) )
parser.add_option( parser.add_option(
"-t", "-t",
action="store_true", dest="stickycookie_all", default=None,
help="Set sticky cookie for all requests."
)
parser.add_option(
"-T",
action="store", dest="stickycookie_filt", default=None, metavar="FILTER", action="store", dest="stickycookie_filt", default=None, metavar="FILTER",
help="Set sticky cookie filter. Matched against requests." help="Set sticky cookie filter. Matched against requests."
) )
parser.add_option( parser.add_option(
"-u", "-u",
action="store_true", dest="stickyauth_all", default=None,
help="Set sticky auth for all requests."
)
parser.add_option(
"-U",
action="store", dest="stickyauth_filt", default=None, metavar="FILTER", action="store", dest="stickyauth_filt", default=None, metavar="FILTER",
help="Set sticky auth filter. Matched against requests." help="Set sticky auth filter. Matched against requests."
) )

8
test/test_cmdline.py
View File

@ -41,14 +41,6 @@ def test_common():
assert cmdline.get_common_options(opts) assert cmdline.get_common_options(opts)
opts.stickycookie_all = True
opts.stickyauth_all = True
v = cmdline.get_common_options(opts)
assert v["stickycookie"] == ".*"
assert v["stickyauth"] == ".*"
opts.stickycookie_all = False
opts.stickyauth_all = False
opts.stickycookie_filt = "foo" opts.stickycookie_filt = "foo"
opts.stickyauth_filt = "foo" opts.stickyauth_filt = "foo"
v = cmdline.get_common_options(opts) v = cmdline.get_common_options(opts)