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

simplify option file loading

Browse Source 
- no need for a constant that is only used once
- if load_paths allows us to specify multiple paths, let's just do that.
This commit is contained in:
Maximilian Hils 2019-11-14 21:12:32 +01:00 committed by GitHub
parent 836e04abd6
commit c78165bd4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mitmproxy/tools/_main.py
View File

@ -67,8 +67,6 @@ def run(
options. options.
""" """
debug.register_info_dumpers() debug.register_info_dumpers()
# Be tolerant as the yml is often recommended
OPTIONS_FILE_NAMES = ["config.yaml", "config.yml"]
opts = options.Options() opts = options.Options()
master = master_cls(opts) master = master_cls(opts)
@ -87,11 +85,11 @@ def run(
sys.exit(1) sys.exit(1)
try: try:
opts.set(*args.setoptions, defer=True) opts.set(*args.setoptions, defer=True)
for conf_file in OPTIONS_FILE_NAMES: optmanager.load_paths(
optmanager.load_paths( opts,
opts, os.path.join(opts.confdir, "config.yaml"),
os.path.join(opts.confdir, conf_file), os.path.join(opts.confdir, "config.yml"),
) )
pconf = process_options(parser, opts, args) pconf = process_options(parser, opts, args)
server: typing.Any = None server: typing.Any = None
if pconf.options.server: if pconf.options.server: