Fix a few encoding/decoding and OSD timeout bugs

2 files changed, 17 insertions, 11 deletions

diff --git a/beinc_server.py b/beinc_server.py
index 3d9ff35..284f657 100755
--- a/beinc_server.py
+++ b/beinc_server.py
@@ -125,9 +125,16 @@ class BEINCInstance(object):
                 sys.exit(errno.EPERM)
             try:
                 self.__osd_notification = pynotify.Notification(' ')
-                self.__osd_notification.timeout = 1000 * int(instance_dict.get(
-                    'osd_timeout', 5))
-                self.__osd_notification.set_category('im.received')
+                if PY3:
+                    self.__osd_notification.timeout = 1000 * int(
+                        instance_dict.get('osd_timeout', 5))
+                    self.__osd_notification.set_category('im.received')
+                else:
+                    self.__osd_notification.set_timeout(
+                        1000 * int(instance_dict.get('osd_timeout', 5)))
+                    self.__osd_notification.set_property(
+                        'app_name',
+                        '{0} {1}'.format(sys.argv[0], __version__))
                 self.__osd_type = BEINC_OSD_TYPE_PYNOTIFY
             except Exception as e:
                 sys.stderr.write(
diff --git a/beinc_weechat.py b/beinc_weechat.py
index a897a7d..cc92301 100644
--- a/beinc_weechat.py
+++ b/beinc_weechat.py
@@ -312,15 +312,14 @@ class WeechatTarget(object):
         values: dict
         template: str
         """
-        template = unicode(template)
         timestamp = datetime.datetime.now().strftime(self.__timestamp_format)
-        replacements = {u'%S': values['server'].decode('utf-8'),
-                        u'%s': values['source_nick'].decode('utf-8'),
-                        u'%c': values['channel'].decode('utf-8'),
-                        u'%m': values['message'].decode('utf-8'),
-                        u'%t': timestamp.decode('utf-8'),
-                        u'%p': u'BEINC',
-                        u'%n': values['own_nick'].decode('utf-8')}
+        replacements = {'%S': values['server'],
+                        '%s': values['source_nick'],
+                        '%c': values['channel'],
+                        '%m': values['message'],
+                        '%t': timestamp,
+                        '%p': u'BEINC',
+                        '%n': values['own_nick']}
         for key, value in replacements.items():
             template = template.replace(key, value)
         return template.encode('utf-8')