fix: make unicode work for python2/3

beaker-project · Dec 29, 2023 · 13d452a · 13d452a
1 parent 0eb25e4
commit 13d452a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Common/bkr/common/helpers.py b/Common/bkr/common/helpers.py
@@ -13,6 +13,7 @@
 import fcntl
 import errno
 from six.moves import queue
+from builtins import str
 
 log = getLogger(__name__)
 
@@ -100,7 +101,7 @@ def run(self):
             self.finished.clear()
 
 
-class SensitiveUnicode(unicode):
+class SensitiveUnicode(str):
     def __repr__(self):
         return '<repr blocked>'
 

diff --git a/Common/bkr/log.py b/Common/bkr/log.py
@@ -7,6 +7,7 @@
 
 import syslog
 import logging
+from builtins import str
 
 
 def log_to_stream(stream, level=logging.WARNING):
@@ -46,7 +47,7 @@ class SysLogHandler(logging.Handler):
     def emit(self, record):
         priority = self._level_to_priority.get(record.levelno, syslog.LOG_WARNING)
         msg = self.format(record)
-        if isinstance(msg, unicode):
+        if isinstance(msg, str):
             msg = msg.encode('utf8')
         msg = msg.replace('\x00', r'\x00')
         for i, line in enumerate(msg.splitlines()):