A better fix for python3 support

Author: szymonlipinski

magicbus/plugins/loggers.py

@@ -2,15 +2,14 @@
 from magicbus.compat import ntob, unicodestr
 import datetime
 import sys
-import six
 from magicbus.plugins import SimplePlugin
 
 
 class StreamLogger(SimplePlugin):
 
     default_format = '[%(timestamp)s] (Bus %(bus)s) %(message)s\n'
 
-    def __init__(self, bus, stream, level=None, format=None, encoding='utf-8'):
+    def __init__(self, bus, stream, level=None, format=None, encoding=None):
         SimplePlugin.__init__(self, bus)
         self.stream = stream
         self.level = level
@@ -30,27 +29,29 @@ def log(self, msg, level):
             if self.encoding is not None:
                 if isinstance(complete_msg, unicodestr):
                     complete_msg = complete_msg.encode(self.encoding)
-            complete_msg = six.ensure_str(complete_msg)
+            else:
+                if not isinstance(complete_msg, unicodestr):
+                    complete_msg = complete_msg.decode("utf-8")
             self.stream.write(complete_msg)
             self.stream.flush()
 
 
 class StdoutLogger(StreamLogger):
 
-    def __init__(self, bus, level=None, format=None, encoding='utf-8'):
+    def __init__(self, bus, level=None, format=None, encoding=None):
         StreamLogger.__init__(self, bus, sys.stdout, level, format, encoding)
 
 
 class StderrLogger(StreamLogger):
 
-    def __init__(self, bus, level=None, format=None, encoding='utf-8'):
+    def __init__(self, bus, level=None, format=None, encoding=None):
         StreamLogger.__init__(self, bus, sys.stderr, level, format, encoding)
 
 
 class FileLogger(StreamLogger):
 
     def __init__(self, bus, filename=None, file=None,
-                 level=None, format=None, encoding='utf8'):
+                 level=None, format=None, encoding=None):
         self.filename = filename
         if file is None:
             if filename is None:

setup.py

@@ -38,7 +38,6 @@
     ),
     python_requires='>=2.7',
     install_requires=[
-        'six',
     ],
     extras_require={
         'testing': [