openstack/diskimage-builder
Code Issues Proposed changes

Merge "Drop logic for old python versions"

Browse Source
This commit is contained in:
Zuul 2024-09-17 23:59:22 +00:00 committed by Gerrit Code Review
commit 5bf57caed7
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diskimage_builder/lib/outfilter.py
View File

@ -75,11 +75,7 @@ def main():
# non-buffered behaviour. on python3, sys.stdin was # non-buffered behaviour. on python3, sys.stdin was
# opened with the system encoding and made the line into # opened with the system encoding and made the line into
# utf-8, so write the logfile out in utf-8 bytes. # utf-8, so write the logfile out in utf-8 bytes.
if sys.version_info < (3,): outfile.write(ts_line.encode('utf-8', errors='surrogateescape'))
outfile.write(ts_line)
else:
outfile.write(
ts_line.encode('utf-8', errors='surrogateescape'))
outfile.flush() outfile.flush()

8
diskimage_builder/logging_config.py
View File

@ -26,7 +26,6 @@ import json
import logging import logging
import logging.config import logging.config
import os import os
import sys
# A simple formatter to more or less copy oslo.log's ContextFormatter # A simple formatter to more or less copy oslo.log's ContextFormatter
@ -43,11 +42,8 @@ class DibFormatter(logging.Formatter):
else: else:
fmt = self.fmt fmt = self.fmt
if sys.version_info < (3, 2): self._style = logging.PercentStyle(fmt)
self._fmt = fmt self._fmt = self._style._fmt
else:
self._style = logging.PercentStyle(fmt)
self._fmt = self._style._fmt
return logging.Formatter.format(self, record) return logging.Formatter.format(self, record)