From db2955b8b51d9a21e560af98def741cadad62faa Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 3 Sep 2024 16:13:57 +0900 Subject: [PATCH] Drop logic for old python versions Now minimum python version supported is 3.6, so any logic for older python versions can be removed. Change-Id: Ie26cc300c823c3e0615f54453dc9ca9366d7a2e0 --- diskimage_builder/lib/outfilter.py | 6 +----- diskimage_builder/logging_config.py | 8 ++------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/diskimage_builder/lib/outfilter.py b/diskimage_builder/lib/outfilter.py index 450d7dbc1..6bad6df2d 100755 --- a/diskimage_builder/lib/outfilter.py +++ b/diskimage_builder/lib/outfilter.py @@ -75,11 +75,7 @@ def main(): # non-buffered behaviour. on python3, sys.stdin was # opened with the system encoding and made the line into # utf-8, so write the logfile out in utf-8 bytes. - if sys.version_info < (3,): - outfile.write(ts_line) - else: - outfile.write( - ts_line.encode('utf-8', errors='surrogateescape')) + outfile.write(ts_line.encode('utf-8', errors='surrogateescape')) outfile.flush() diff --git a/diskimage_builder/logging_config.py b/diskimage_builder/logging_config.py index f1e223840..986d58581 100644 --- a/diskimage_builder/logging_config.py +++ b/diskimage_builder/logging_config.py @@ -26,7 +26,6 @@ import json import logging import logging.config import os -import sys # A simple formatter to more or less copy oslo.log's ContextFormatter @@ -43,11 +42,8 @@ class DibFormatter(logging.Formatter): else: fmt = self.fmt - if sys.version_info < (3, 2): - self._fmt = fmt - else: - self._style = logging.PercentStyle(fmt) - self._fmt = self._style._fmt + self._style = logging.PercentStyle(fmt) + self._fmt = self._style._fmt return logging.Formatter.format(self, record)