Changeset 12bfb27 for skype/skyped.py

Timestamp:

2008-11-07T13:34:51Z (16 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

7199b74

Parents:

cc5f8ac (diff), c49820d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of vmiklos@…:/home/vmiklos/ftp/vmiklos.hu/htdocs/project/bitlbee-skype

File:

• skype/skyped.py (modified) (1 diff)

skype/skyped.py

@@ -178 +178 @@
                 if not len(msg_text) or msg_text == "PONG":
                         return
-                e = msg_text.decode(locale.getdefaultlocale()[1])
+                try:
+                        e = msg_text.decode(locale.getdefaultlocale()[1])
+                except ValueError:
+                        e = msg_text.decode('UTF-8')
                 dprint('>> ' + e)
                 try: