From b57d25c69a193d3866ea86a3a34edd67049b198d Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Tue, 1 Feb 2022 18:30:37 -0800 Subject: [PATCH] clean up return type for parser_info --- jc/lib.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/jc/lib.py b/jc/lib.py index b7e58cd9..5fb8d681 100644 --- a/jc/lib.py +++ b/jc/lib.py @@ -6,7 +6,7 @@ import sys import os import re import importlib -from typing import Dict, List, Iterable, Union, Iterator, Optional +from typing import Dict, List, Iterable, Union, Iterator from jc import appdirs __version__ = '1.18.3' @@ -225,7 +225,7 @@ def plugin_parser_mod_list() -> List[str]: """ return [_cliname_to_modname(p) for p in local_parsers] -def parser_info(parser_mod_name: str) -> Optional[Dict]: +def parser_info(parser_mod_name: str) -> Dict: """ Returns a dictionary that includes the module metadata. @@ -236,9 +236,9 @@ def parser_info(parser_mod_name: str) -> Optional[Dict]: parser_mod_name = _cliname_to_modname(parser_mod_name) parser_mod = _get_parser(parser_mod_name) + info_dict: Dict = {} if hasattr(parser_mod, 'info'): - info_dict: Dict = {} info_dict['name'] = parser_mod_name info_dict['argument'] = _parser_argument(parser_mod_name) parser_entry = vars(parser_mod.info) @@ -250,11 +250,9 @@ def parser_info(parser_mod_name: str) -> Optional[Dict]: if _modname_to_cliname(parser_mod_name) in local_parsers: info_dict['plugin'] = True - return info_dict + return info_dict - return None - -def all_parser_info() -> List[Optional[Dict]]: +def all_parser_info() -> List[Dict]: """ Returns a list of dictionaries that includes metadata for all modules. """