jenkins-bot submitted this change.
[IMPR] Use logging.Formatter directly instead of renaming it
Change-Id: I6f8a139621569ff8247bb3c35934fb8d8b4e980f
---
M pywikibot/userinterfaces/terminal_interface_base.py
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py
index 9db7fc3..db0f695 100755
--- a/pywikibot/userinterfaces/terminal_interface_base.py
+++ b/pywikibot/userinterfaces/terminal_interface_base.py
@@ -105,7 +105,7 @@
# this handler ignores levels above INPUT
default_handler.addFilter(MaxLevelFilter(INPUT))
default_handler.setFormatter(
- TerminalFormatter(fmt='%(message)s%(newline)s'))
+ logging.Formatter(fmt='%(message)s%(newline)s'))
root_logger.addHandler(default_handler)
# handler for level STDOUT
@@ -113,14 +113,14 @@
output_handler.setLevel(STDOUT)
output_handler.addFilter(MaxLevelFilter(STDOUT))
output_handler.setFormatter(
- TerminalFormatter(fmt='%(message)s%(newline)s'))
+ logging.Formatter(fmt='%(message)s%(newline)s'))
root_logger.addHandler(output_handler)
# handler for levels WARNING and higher
warning_handler = TerminalHandler(self, strm=self.stderr)
warning_handler.setLevel(WARNING)
warning_handler.setFormatter(
- TerminalFormatter(fmt='%(levelname)s: %(message)s%(newline)s'))
+ logging.Formatter(fmt='%(levelname)s: %(message)s%(newline)s'))
root_logger.addHandler(warning_handler)
warnings_logger = logging.getLogger('py.warnings')
@@ -544,11 +544,6 @@
return self.UI.output(text, targetStream=self.stream)
-class TerminalFormatter(logging.Formatter):
-
- """Terminal logging formatter."""
-
-
class MaxLevelFilter(logging.Filter):
"""Filter that only passes records at or below a specific level.
To view, visit change 692261. To unsubscribe, or for help writing mail filters, visit settings.