Fixes UTF-8 exceptions on python2

Closes #31

Author: Elektordi

obswebsocket/base_classes.py

@@ -15,7 +15,7 @@ def input(self, data):
         self.datain = r
 
     def __repr__(self):
-        return "<{} event ({})>".format(self.name, self.datain)
+        return u"<{} event ({})>".format(self.name, self.datain)
 
 
 class Baserequests:
@@ -39,10 +39,10 @@ def input(self, data):
 
     def __repr__(self):
         if self.status is None:
-            return "<{} request ({}) waiting>".format(self.name, self.dataout)
+            return u"<{} request ({}) waiting>".format(self.name, self.dataout)
         elif self.status:
-            return "<{} request ({}) called: success ({})>".format(
+            return u"<{} request ({}) called: success ({})>".format(
                 self.name, self.dataout, self.datain)
         else:
-            return "<{} request ({}) called: failed ({})>".format(
+            return u"<{} request ({}) called: failed ({})>".format(
                 self.name, self.dataout, self.datain)

obswebsocket/core.py

@@ -174,7 +174,7 @@ def send(self, data):
         message_id = str(self.id)
         self.id += 1
         data["message-id"] = message_id
-        LOG.debug("Sending message id {}: {}".format(message_id, data))
+        LOG.debug(u"Sending message id {}: {}".format(message_id, data))
         self.ws.send(json.dumps(data))
         return self._wait_message(message_id)
 
@@ -184,7 +184,7 @@ def _wait_message(self, message_id):
             if message_id in self.answers:
                 return self.answers.pop(message_id)
             time.sleep(0.1)
-        raise exceptions.MessageTimeout("No answer for message {}".format(
+        raise exceptions.MessageTimeout(u"No answer for message {}".format(
             message_id))
 
     def register(self, func, event=None):
@@ -231,20 +231,20 @@ def run(self):
 
                 result = json.loads(message)
                 if 'update-type' in result:
-                    LOG.debug("Got message: {}".format(result))
+                    LOG.debug(u"Got message: {}".format(result))
                     obj = self.build_event(result)
                     self.core.eventmanager.trigger(obj)
                 elif 'message-id' in result:
-                    LOG.debug("Got answer for id {}: {}".format(
+                    LOG.debug(u"Got answer for id {}: {}".format(
                         result['message-id'], result))
                     self.core.answers[result['message-id']] = result
                 else:
-                    LOG.warning("Unknown message: {}".format(result))
+                    LOG.warning(u"Unknown message: {}".format(result))
             except websocket.WebSocketConnectionClosedException:
                 if self.running:
                     self.core.reconnect()
             except (ValueError, exceptions.ObjectError) as e:
-                LOG.warning("Invalid message: {} ({})".format(message, e))
+                LOG.warning(u"Invalid message: {} ({})".format(message, e))
         # end while
         LOG.debug("RecvThread ended.")
 
@@ -254,7 +254,7 @@ def build_event(data):
         try:
             obj = getattr(events, name)()
         except AttributeError:
-            raise exceptions.ObjectError("Invalid event {}".format(name))
+            raise exceptions.ObjectError(u"Invalid event {}".format(name))
         obj.input(data)
         return obj
 

samples/events.py

@@ -16,11 +16,11 @@
 
 
 def on_event(message):
-    print("Got message: {}".format(message))
+    print(u"Got message: {}".format(message))
 
 
 def on_switch(message):
-    print("You changed the scene to {}".format(message.getSceneName()))
+    print(u"You changed the scene to {}".format(message.getSceneName()))
 
 
 ws = obsws(host, port, password)

samples/switch_scenes.py

@@ -22,7 +22,7 @@
     scenes = ws.call(requests.GetSceneList())
     for s in scenes.getScenes():
         name = s['name']
-        print("Switching to {}".format(name))
+        print(u"Switching to {}".format(name))
         ws.call(requests.SetCurrentScene(name))
         time.sleep(2)