Skip to content

Commit 6498b60

Browse files
committed
remove (useless) init_logger function
Signed-off-by: Zen <[email protected]>
1 parent 9c8eec3 commit 6498b60

File tree

3 files changed

+10
-18
lines changed

3 files changed

+10
-18
lines changed

src/zenlib/util/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from .colorize import colorize
22
from .dict_check import contains, unset
33
from .handle_plural import handle_plural
4-
from .main_funcs import get_args_n_logger, get_kwargs, get_kwargs_from_args, init_logger, process_args
4+
from .main_funcs import get_args_n_logger, get_kwargs, get_kwargs_from_args, process_args
55
from .merge_class import merge_class
66
from .pretty_print import pretty_print
77
from .replace_file_line import replace_file_line
@@ -13,7 +13,6 @@
1313
"NoDupFlatList",
1414
"pretty_print",
1515
"replace_file_line",
16-
"init_logger",
1716
"process_args",
1817
"get_args_n_logger",
1918
"get_kwargs_from_args",

src/zenlib/util/main_funcs.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Functions to help with the main()
33
"""
44

5-
__version__ = "1.4.0"
5+
__version__ = "1.4.1"
66

77
from argparse import ArgumentError, ArgumentParser, Namespace
88
from importlib.metadata import version
@@ -22,12 +22,6 @@ def get_base_args():
2222
]
2323

2424

25-
def init_logger(name=None):
26-
"""Initialize the logger with a name"""
27-
name = name or __name__
28-
return getLogger(name)
29-
30-
3125
def get_kwargs_from_args(args, logger=None, base_kwargs={}, drop_base=True):
3226
"""Get kwargs from argparser args.
3327
Drop base doesn't add args defined in get_base_args.
@@ -123,7 +117,7 @@ def get_args_n_logger(package, description: str, arguments=[], drop_default=Fals
123117
dump_args_for_autocomplete(all_arguments)
124118

125119
argparser = ArgumentParser(prog=package, description=description)
126-
logger = init_logger(package)
120+
logger = getLogger(package)
127121

128122
def add_args(args, argparser):
129123
for arg in args:

tests/test_main_funcs.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from logging import Logger
33
from unittest import TestCase, expectedFailure, main
44

5-
from zenlib.util import get_args_n_logger, get_kwargs, get_kwargs_from_args, init_logger
5+
from zenlib.util import get_args_n_logger, get_kwargs, get_kwargs_from_args
66
from zenlib.util.main_funcs import dump_args_for_autocomplete, get_base_args
77

88
DEFAULT_ARGS = ["debug", "trace", "log_time", "no_log_color"]
@@ -15,17 +15,14 @@ def get_test_args():
1515

1616

1717
class TestMainFuncs(TestCase):
18-
def test_init_logger(self):
19-
self.assertIsInstance(init_logger(), Logger)
20-
2118
def _check_for_test_args(self, args):
2219
self.assertIsInstance(args, Namespace)
2320

24-
if 'discover' not in args.args:
21+
if "discover" not in args.args:
2522
self.fail("discover not found in args")
2623

27-
search_strs = ['tests', './tests']
28-
if '_unknown' in args:
24+
search_strs = ["tests", "./tests"]
25+
if "_unknown" in args:
2926
search_locs = [args.args, args._unknown]
3027
else:
3128
search_locs = [args.args]
@@ -44,7 +41,9 @@ def test_get_args_n_logger(self):
4441
self._check_for_test_args(args)
4542

4643
def test_get_args_n_logger_no_default(self):
47-
args, logger = get_args_n_logger("zenlib_test", "test description", get_test_args(), strict=False, drop_default=True)
44+
args, logger = get_args_n_logger(
45+
"zenlib_test", "test description", get_test_args(), strict=False, drop_default=True
46+
)
4847
self.assertIsInstance(logger, Logger)
4948

5049
for arg in DEFAULT_ARGS:

0 commit comments

Comments
 (0)