File tree Expand file tree Collapse file tree 2 files changed +23
-17
lines changed Expand file tree Collapse file tree 2 files changed +23
-17
lines changed Original file line number Diff line number Diff line change 12
12
# See the License for the specific language governing permissions and
13
13
# limitations under the License.
14
14
import argparse
15
- import logging
15
+ import logging . config
16
16
from typing import Any , List , Tuple
17
17
18
18
import importlib_metadata
48
48
49
49
50
50
def configure_logging () -> None :
51
- root_logger = logging .getLogger ("twine" )
52
-
53
- # This prevents failures test_main.py due to capsys not being cleared.
54
- # TODO: Use dictConfig() instead?
55
- for handler in root_logger .handlers :
56
- root_logger .removeHandler (handler )
57
-
58
- root_logger .addHandler (
59
- rich .logging .RichHandler (
60
- console = console ,
61
- show_time = False ,
62
- show_path = False ,
63
- highlighter = rich .highlighter .NullHighlighter (),
64
- )
51
+ # Using dictConfig to override existing loggers, which prevents failures in
52
+ # test_main.py due to capsys not being cleared.
53
+ logging .config .dictConfig (
54
+ {
55
+ "version" : 1 ,
56
+ "handlers" : {
57
+ "console" : {
58
+ "class" : "rich.logging.RichHandler" ,
59
+ "console" : console ,
60
+ "show_time" : False ,
61
+ "show_path" : False ,
62
+ "highlighter" : rich .highlighter .NullHighlighter (),
63
+ }
64
+ },
65
+ "loggers" : {
66
+ "twine" : {
67
+ "handlers" : ["console" ],
68
+ },
69
+ },
70
+ }
65
71
)
66
72
67
73
Original file line number Diff line number Diff line change @@ -149,8 +149,8 @@ def verbose(self) -> bool:
149
149
def verbose (self , verbose : bool ) -> None :
150
150
"""Initialize a logger based on the --verbose option."""
151
151
self ._verbose = verbose
152
- root_logger = logging .getLogger ("twine" )
153
- root_logger .setLevel (logging .INFO if verbose else logging .WARNING )
152
+ twine_logger = logging .getLogger ("twine" )
153
+ twine_logger .setLevel (logging .INFO if verbose else logging .WARNING )
154
154
155
155
@staticmethod
156
156
def register_argparse_arguments (parser : argparse .ArgumentParser ) -> None :
You can’t perform that action at this time.
0 commit comments