diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2019-11-15 00:31:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-15 00:31:19 +0100 |
| commit | cd660a035f74e00bd94a9b67c240ee44654ce1ce (patch) | |
| tree | 17df5070fa5aad02f5597b50ca3ae65c27062f0a | |
| parent | d38e20689e053b2369e29790562a1e507f1ac9ef (diff) | |
| parent | c78165bd4c4e3ad89ed603d702c51f6b043b3b60 (diff) | |
| download | mitmproxy-cd660a035f74e00bd94a9b67c240ee44654ce1ce.tar.gz mitmproxy-cd660a035f74e00bd94a9b67c240ee44654ce1ce.tar.bz2 mitmproxy-cd660a035f74e00bd94a9b67c240ee44654ce1ce.zip | |
Merge pull request #3697 from ylmrx/issue_3639-yml_extension_allowed
adding config.yml as an allowed config filename
| -rw-r--r-- | mitmproxy/tools/_main.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mitmproxy/tools/_main.py b/mitmproxy/tools/_main.py index 8a98278d..a00a3e98 100644 --- a/mitmproxy/tools/_main.py +++ b/mitmproxy/tools/_main.py @@ -17,8 +17,6 @@ from mitmproxy import optmanager from mitmproxy import proxy from mitmproxy.utils import debug, arg_check -OPTIONS_FILE_NAME = "config.yaml" - def assert_utf8_env(): spec = "" @@ -89,7 +87,8 @@ def run( opts.set(*args.setoptions, defer=True) optmanager.load_paths( opts, - os.path.join(opts.confdir, OPTIONS_FILE_NAME), + os.path.join(opts.confdir, "config.yaml"), + os.path.join(opts.confdir, "config.yml"), ) pconf = process_options(parser, opts, args) server: typing.Any = None |