test rebase

platformcode/logger.py

@@ -6,9 +6,12 @@
 import inspect
 
 import xbmc
-
 from platformcode import config
 
+import sys
+PY3 = False
+if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int
+
 loggeractive = (config.get_setting("debug") == True)
 
 
@@ -18,13 +21,19 @@ def log_enable(active):
 
 
 def encode_log(message=""):
+    
     # Unicode to utf8
-    if type(message) == unicode:
+    if isinstance(message, unicode):
         message = message.encode("utf8")
+        if PY3: message = message.decode("utf8")
 
     # All encodings to utf8
-    elif type(message) == str:
+    elif not PY3 and isinstance(message, str):
         message = unicode(message, "utf8", errors="replace").encode("utf8")
+    
+    # Bytes encodings to utf8
+    elif PY3 and isinstance(message, bytes):
+        message = message.decode("utf8")
 
     # Objects to string
     else:
@@ -34,6 +43,17 @@ def encode_log(message=""):
 
 
 def get_caller(message=None):
+    
+    if message and isinstance(message, unicode):
+        message = message.encode("utf8")
+        if PY3: message = message.decode("utf8")
+    elif message and PY3 and isinstance(message, bytes):
+        message = message.decode("utf8")
+    elif message and not PY3:
+        message = unicode(message, "utf8", errors="replace").encode("utf8")
+    elif message:
+        message = str(message) 
+    
     module = inspect.getmodule(inspect.currentframe().f_back.f_back)
 
     if module == None: