Merge branch 'master' into experimental

1 files changed, 4 insertions, 4 deletions

diff --git a/examples/data/scripts/uzbl-event-manager b/examples/data/scripts/uzbl-event-manager
index 99b215a..a92485f 100755
--- a/examples/data/scripts/uzbl-event-manager
+++ b/examples/data/scripts/uzbl-event-manager
@@ -295,7 +295,7 @@ def parse_msg(uzbl, msg):
     cmd = FINDSPACES.split(msg, 3)
     if not cmd or cmd[0] != 'EVENT':
         # Not an event message.
-        print '---', msg
+        print '---', msg.encode('utf-8')
         return
 
     while len(cmd) < 4:
@@ -374,11 +374,11 @@ class UzblInstance(object):
 
         msg = msg.strip()
         if self.client_socket:
-            print '%s<-- %s' % ('  ' * self.depth, msg)
+            print (u'%s<-- %s' % ('  ' * self.depth, msg)).encode('utf-8')
             self.client_socket.send(("%s\n" % msg).encode('utf-8'))
 
         else:
-            print '%s!-- %s' % ('  ' * self.depth, msg)
+            print (u'%s!-- %s' % ('  ' * self.depth, msg)).encode('utf-8')
 
 
     def export(self, name, function):
@@ -466,7 +466,7 @@ class UzblInstance(object):
         elems = [event,]
         if args: elems.append(unicode(args))
         if kargs: elems.append(unicode(kargs))
-        print "%s--> %s" % ('  ' * self.depth, ' '.join(elems))
+        print (u'%s--> %s' % ('  ' * self.depth, ' '.join(elems))).encode('utf-8')
 
         if event == "INSTANCE_START" and args:
             self.pid = int(args[0])