tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Clean up arg name and remove lying comment

Browse source
This commit is contained in:
Erik Johnston 2019-07-16 11:39:13 +01:00
parent d0d479c1af
commit f44354e17f
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
synapse/config/_base.py
View file

@ -266,12 +266,10 @@ class Config(object):
" Defaults to the directory containing the last config file",
)
# We can only invoke `add_arguments` on an actual object, but
# `add_arguments` should be side effect free so this is probably fine.
cls.invoke_all_static("add_arguments", config_parser)
@classmethod
def load_config_with_parser(cls, config_parser, argv):
def load_config_with_parser(cls, parser, argv):
"""Parse the commandline and config files with the given parser
Doesn't support config-file-generation: used by the worker apps.
@ -279,23 +277,23 @@ class Config(object):
Used for workers where we want to add extra flags/subcommands.
Args:
config_parser (ArgumentParser)
parser (ArgumentParser)
argv (list[str])
Returns:
tuple[HomeServerConfig, argparse.Namespace]: Returns the parsed
config object and the parsed argparse.Namespace object from
`config_parser.parse_args(..)`
`parser.parse_args(..)`
"""
obj = cls()
config_args = config_parser.parse_args(argv)
config_args = parser.parse_args(argv)
config_files = find_config_files(search_paths=config_args.config_path)
if not config_files:
config_parser.error("Must supply a config file.")
parser.error("Must supply a config file.")
if config_args.keys_directory:
config_dir_path = config_args.keys_directory