Changeset 3423be0 for skype

Timestamp:

2011-02-07T23:24:37Z (14 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

d5a66f8

Parents:

c899eb0

git-author:

Philippe Crama <pcfeb0009@…> (07-02-11 23:24:37)

git-committer:

Miklos Vajna <vmiklos@…> (07-02-11 23:24:37)

Message:

Always use UTF-8 encoding when dealing with BitlBee

BitlBee internally always uses UTF-8 (see initialization of
irc->iconv and irc->oconv in set_eval_charset in irc.c of
BitlBee's source and their usage in eg irc_vawrite in the
same file; confirmed on #bitlbee), so it makes no sense to
either get an encoding from the current locale or to make it
a runtime setting.

File:

• skype/skyped.py (modified) (2 diffs)

skype/skyped.py

@@ -237 +237 @@
                         msg_text = [msg_text]
                 for i in msg_text:
-                        # use utf-8 here to solve the following problem:
-                        # people use env vars like LC_ALL=en_US (latin1) then
-                        # they complain about why can't they receive latin2
-                        # messages.. so here it is: always use utf-8 then
-                        # everybody will be happy
-                        e = i.encode('UTF-8')
+                        try:
+                                # Internally, BitlBee always uses UTF-8 and encodes/decodes as
+                                # necessary to communicate with the IRC client; thus send the
+                                # UTF-8 it expects
+                                e = i.encode('UTF-8')
+                        except:
+                                # Should never happen, but it's better to send difficult to
+                                # read data than crash because some message couldn't be encoded
+                                e = i.encode('ascii', 'backslashreplace')
                         if options.conn:
                                 dprint('<< ' + e)
@@ -260 +263 @@
                         return
                 try:
-                        encoding = locale.getdefaultlocale()[1]
-                        if not encoding:
-                                raise ValueError
-                        e = msg_text.decode(encoding)
-                except ValueError:
+                        # Internally, BitlBee always uses UTF-8 and encodes/decodes as
+                        # necessary to communicate with the IRC client; thus decode the
+                        # UTF-8 it sent us
                         e = msg_text.decode('UTF-8')
+                except:
+                        # Should never happen, but it's better to send difficult to read
+                        # data to Skype than to crash
+                        e = msg_text.decode('ascii', 'backslashreplace')
                 dprint('>> ' + e)
                 try: