From d506b9ff49e2f5d2826722117bd0481e4859483e Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 27 Jul 2023 11:40:14 +0100 Subject: [PATCH] mypy: Add typing to openstack._log A nice easy one to start. Change-Id: I9a08341002cbf90ba9dccaacaa5f2d3e7d7560a2 Signed-off-by: Stephen Finucane --- openstack/_log.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/openstack/_log.py b/openstack/_log.py index 6a909fc34..62f2c7d36 100644 --- a/openstack/_log.py +++ b/openstack/_log.py @@ -14,9 +14,14 @@ import logging import sys +import typing as ty -def setup_logging(name, handlers=None, level=None): +def setup_logging( + name: str, + handlers: ty.Optional[ty.List[logging.Handler]] = None, + level: ty.Optional[int] = None, +) -> logging.Logger: """Set up logging for a named logger. Gets and initializes a named logger, ensuring it at least has a @@ -34,8 +39,7 @@ def setup_logging(name, handlers=None, level=None): handlers = handlers or [] log = logging.getLogger(name) if len(log.handlers) == 0 and not handlers: - h = logging.NullHandler() - log.addHandler(h) + log.addHandler(logging.NullHandler()) for h in handlers: log.addHandler(h) if level: @@ -44,14 +48,14 @@ def setup_logging(name, handlers=None, level=None): def enable_logging( - debug=False, - http_debug=False, - path=None, - stream=None, - format_stream=False, - format_template='%(asctime)s %(levelname)s: %(name)s %(message)s', - handlers=None, -): + debug: bool = False, + http_debug: bool = False, + path: ty.Optional[str] = None, + stream: ty.Optional[ty.TextIO] = None, + format_stream: bool = False, + format_template: str = '%(asctime)s %(levelname)s: %(name)s %(message)s', + handlers: ty.Optional[ty.List[logging.Handler]] = None, +) -> None: """Enable logging output. Helper function to enable logging. This function is available for