Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove last vestiges of argparse

This commit is contained in:
Aldo Cortesi 2014-11-15 17:51:21 +13:00
parent 5af7c9ebf4
commit 23a4f159fd
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libmproxy/cmdline.py
View File

@ -2,7 +2,6 @@ from __future__ import absolute_import
import os import os
import re import re
import configargparse import configargparse
import argparse
from netlib import http from netlib import http
from . import filt, utils, version from . import filt, utils, version
from .proxy import config from .proxy import config
@ -105,7 +104,7 @@ def parse_server_spec(url):
p = http.parse_url(normalized_url) p = http.parse_url(normalized_url)
if not p or not p[1]: if not p or not p[1]:
raise argparse.ArgumentTypeError( raise configargparse.ArgumentTypeError(
"Invalid server specification: %s" % url "Invalid server specification: %s" % url
) )
@ -136,17 +135,17 @@ def get_common_options(options):
try: try:
p = parse_replace_hook(i) p = parse_replace_hook(i)
except ParseException, e: except ParseException, e:
raise argparse.ArgumentTypeError(e.message) raise configargparse.ArgumentTypeError(e.message)
reps.append(p) reps.append(p)
for i in options.replace_file: for i in options.replace_file:
try: try:
patt, rex, path = parse_replace_hook(i) patt, rex, path = parse_replace_hook(i)
except ParseException, e: except ParseException, e:
raise argparse.ArgumentTypeError(e.message) raise configargparse.ArgumentTypeError(e.message)
try: try:
v = open(path, "rb").read() v = open(path, "rb").read()
except IOError, e: except IOError, e:
raise argparse.ArgumentTypeError( raise configargparse.ArgumentTypeError(
"Could not read replace file: %s" % path "Could not read replace file: %s" % path
) )
reps.append((patt, rex, v)) reps.append((patt, rex, v))
@ -156,7 +155,7 @@ def get_common_options(options):
try: try:
p = parse_setheader(i) p = parse_setheader(i)
except ParseException, e: except ParseException, e:
raise argparse.ArgumentTypeError(e.message) raise configargparse.ArgumentTypeError(e.message)
setheaders.append(p) setheaders.append(p)
return dict( return dict(
@ -590,7 +589,7 @@ def mitmdump():
action="count", dest="flow_detail", default=1, action="count", dest="flow_detail", default=1,
help="Increase flow detail display level. Can be passed multiple times." help="Increase flow detail display level. Can be passed multiple times."
) )
parser.add_argument('args', nargs=argparse.REMAINDER) parser.add_argument('args', nargs="...")
return parser return parser