Skip to content

Make loggers handle str + bytes seamlessly #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
Draft

Make loggers handle str + bytes seamlessly #22

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4e70343
Fix code for Python3
szymonlipinski Dec 17, 2020
cb8634d
Add six to required packages.
szymonlipinski Dec 18, 2020
36dc463
A better fix for python3 support
szymonlipinski Dec 18, 2020
b5761c3
Revert changes for the StreamLogger and FileLogger
szymonlipinski Jan 28, 2021
af96c89
Fix encoding name
szymonlipinski Feb 3, 2021
d7eec51
Revert last changes to check tests
szymonlipinski Feb 3, 2021
0f5e961
Revert "Revert last changes to check tests"
szymonlipinski Feb 3, 2021
ba01eb3
Fix loggers code
szymonlipinski Feb 3, 2021
7307626
Fix loggers code
szymonlipinski Feb 3, 2021
0e79f04
Revert the last loggers changes
szymonlipinski Feb 4, 2021
9f24f0f
clean code
szymonlipinski Feb 11, 2021
adbb1a2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 16, 2025
07eef00
Only decode messages in case of `bytes`
webknjaz Jun 16, 2025
e4d3ab4
Revert "A better fix for python3 support"
webknjaz Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions magicbus/plugins/loggers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ def log(self, msg, level):
}
complete_msg = self.format % params

if self.encoding is not None:
if isinstance(complete_msg, str):
complete_msg = complete_msg.encode(self.encoding)
if isinstance(complete_msg, bytes):
encoding = 'utf-8' if self.encoding is None else self.encoding
complete_msg = complete_msg.decode(encoding)

self.stream.write(complete_msg)
self.stream.flush()
Expand Down
Loading