Unicode for OSX fixes

Author: KenV99

resources/lib/kodilogging.py

@@ -63,6 +63,6 @@ def log(loglevel=None, msg=''):
             msg = msg.decode("utf-8")
         if KodiLogger.kodirunning:
             message = u"$$$ [%s] - %s" % (u'kodi.callbacks', msg)
-            xbmc.log(msg=message.encode("utf-8", errors='replace'), level=loglevel)
+            xbmc.log(msg=message.encode("utf-8", 'replace'), level=loglevel)
         else:
             print msg

resources/lib/tasks/taskHttp.py

@@ -111,7 +111,15 @@ def sendRequest(self, session, verb, url, postget=False):
             return err, msg
         if verb == 'POST' or verb == 'PUT':
             prepped.headers['Content-Type'] = self.taskKwargs['content-type']
-        msg = u'Prepped URL: %s\nBody: %s' % (prepped.url.decode('utf-8'), prepped.body.decode('utf-8'))
+        try:
+            pu = prepped.url.decode('utf-8')
+        except (AttributeError, UnicodeDecodeError):
+            pu = u''
+        try:
+            pb = prepped.body.decode('utf-8')
+        except (AttributeError, UnicodeDecodeError):
+            pb = u''
+        msg = u'Prepped URL: %s\nBody: %s' % (pu, pb)
         sys.exc_clear()
         try:
             resp = session.send(prepped, timeout=20)
@@ -121,7 +129,7 @@ def sendRequest(self, session, verb, url, postget=False):
             if resp.text == '':
                 respmsg = u'No response received'
             else:
-                respmsg = resp.text.decode('unicode_escape', errors='ignore')
+                respmsg = resp.text.decode('unicode_escape', 'ignore')
             msg += u'\nResponse for %s: %s' %(verb, respmsg)
             resp.close()
         except requests.ConnectionError:

resources/lib/tasks/taskJson.py

@@ -56,9 +56,9 @@ def run(self):
         data = json.dumps(self.publisherKwargs)
         try:
             qs = u'{ "jsonrpc": "2.0", "id": 0, "method": "JSONRPC.NotifyAll", "params": {"sender":"%s", "message":"%s", "data":%s} }' %(self.taskKwargs['jsonnotify'], message, data)
-            qs = qs.encode('utf-8', errors='ignore')
+            qs = qs.encode('utf-8', 'ignore')
             json_query = xbmc.executeJSONRPC(qs)
-            json_query = unicode(json_query, 'utf-8', errors='ignore')
+            json_query = unicode(json_query, 'utf-8', 'ignore')
             json_response = json.loads(json_query)
         except Exception:
             e = sys.exc_info()[0]

resources/lib/tasks/taskScript.py

@@ -159,7 +159,7 @@ def run(self):
                 stdoutdata, stderrdata = p.communicate()
                 if stdoutdata is not None:
                     fse = sys.getfilesystemencoding()
-                    stdoutdata = stdoutdata.decode(fse, errors='ignore').strip()
+                    stdoutdata = stdoutdata.decode(fse, 'ignore').strip()
                     if stdoutdata != '':
                         msg += _(u'Process returned data: [%s]\n') % stdoutdata
                     else:
@@ -168,7 +168,7 @@ def run(self):
                     msg += _(u'Process returned no data\n')
                 if stderrdata is not None:
                     fse = sys.getfilesystemencoding()
-                    stderrdata = stderrdata.decode(fse, errors='ignore').strip()
+                    stderrdata = stderrdata.decode(fse, 'ignore').strip()
                     if stderrdata != '':
                         msg += _(u'Process returned error: %s') % stderrdata
         except ValueError, e:
@@ -182,7 +182,7 @@ def run(self):
             err = True
             if hasattr(e, 'message'):
                 msg = unicode(e.message)
-            msg = msg + u'\n' +traceback.format_exc().decode('utf-8')
+            msg = msg + u'\n' +traceback.format_exc().decode('utf-8', 'ignore')
         finally:
             os.chdir(cwd)
         self.threadReturn(err, msg)

resources/lib/tests/tstScript.sh

@@ -697,25 +697,25 @@ def homepath():
     return ret
 
 
-class ReversibleDict(dict):
-    def __init__(self, *args, **kwargs):
-        super(ReversibleDict, self).__init__(*args, **kwargs)
-        self.rev = {v: k for k, v in self.items()}
-
-    def __delitem__(self, k):
-        del self.rev[self[k]]
-        del super(ReversibleDict, self)[k]
-
-    def __setitem__(self, k, v):
-        try:
-            del self.rev[self[k]]
-        except KeyError:
-            pass
-        super(ReversibleDict, self)[k] = v
-        self.rev[v] = k
-
-    def lookup(self, v):
-        return self.rev[v]
+# class ReversibleDict(dict):
+#     def __init__(self, *args, **kwargs):
+#         super(ReversibleDict, self).__init__(*args, **kwargs)
+#         self.rev = {v: k for k, v in self.items()}
+#
+#     def __delitem__(self, k):
+#         del self.rev[self[k]]
+#         del super(ReversibleDict, self)[k]
+#
+#     def __setitem__(self, k, v):
+#         try:
+#             del self.rev[self[k]]
+#         except KeyError:
+#             pass
+#         super(ReversibleDict, self)[k] = v
+#         self.rev[v] = k
+#
+#     def lookup(self, v):
+#         return self.rev[v]
 
 
 if __name__ == '__main__':