Skip to content

Commit 053782c

Browse files
committed
add simple add_kwargs fuction
Signed-off-by: Zen <[email protected]>
1 parent e7bc912 commit 053782c

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

src/zenlib/util/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
from .main_funcs import init_argparser
1111
from .main_funcs import get_args_n_logger
1212
from .main_funcs import get_kwargs_from_args
13+
from .main_funcs import get_kwargs
1314

1415
__all__ = ['handle_plural', 'NoDupFlatList', 'pretty_print', 'replace_file_line',
1516
'update_init', 'walk_dict', 'check_dict', 'init_logger', 'process_args',
16-
'init_argparser', 'get_args_n_logger', 'get_kwargs_from_args']
17+
'init_argparser', 'get_args_n_logger', 'get_kwargs_from_args', 'get_kwargs']

src/zenlib/util/main_funcs.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,10 @@ def process_args(argparser, logger=None):
8383
return args
8484

8585

86-
def get_args_n_logger(package, description: str, arguments=[], get_kwargs=False):
86+
def get_args_n_logger(package, description: str, arguments=[]):
8787
""" Takes a package name and description
8888
If arguments are passed, they are added to argparser.
89-
If get_kwargs is set to True a kwarg dict will be returned.
90-
If not, returns the parsed args and logger.
89+
Returns the parsed args and logger.
9190
"""
9291
argparser = init_argparser(prog=package, description=description)
9392
logger = init_logger(package)
@@ -97,8 +96,10 @@ def get_args_n_logger(package, description: str, arguments=[], get_kwargs=False)
9796
argparser.add_argument(*dest, **arg)
9897

9998
args = process_args(argparser, logger=logger)
99+
return args, logger
100100

101-
if get_kwargs:
102-
return get_kwargs_from_args(args, logger=logger)
103101

104-
return args, logger
102+
def get_kwargs(package, description: str, arguments=[]):
103+
""" Like get_args_n_logger, but only returns kwargs """
104+
args, logger = get_args_n_logger(package, description, arguments)
105+
return get_kwargs_from_args(args, logger=logger)

0 commit comments

Comments
 (0)