Changeset f932b65

Timestamp:

2007-08-20T18:56:46Z (17 years ago)

Author:

VMiklos <vmiklos@…>

Branches:

master

Children:

565982f

Parents:

62bb4e4

Message:

skyped: some cleanup, no encoding is needed when sending messages

File:

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

skype/skyped.py

@@ -15 +15 @@
 CLIENT_NAME = 'SkypeApiPythonShell'
 
-local_encoding = locale.getdefaultlocale()[1]
-need_conv = (local_encoding != 'utf-8')
-
 # well, this is a bit hackish. we store the socket of the last connected client
 # here and notify it. maybe later notify all connected clients?
 conn = None
-
-def utf8_decode(utf8_str):
-        if need_conv:
-                return utf8_str.decode('utf-8').encode(local_encoding, 'replace')
-        else:
-                return utf8_str
-
-def utf8_encode(local_str):
-        if need_conv:
-                return local_str.decode(local_encoding).encode('utf-8')
-        else:
-                return local_str
 
 def sig_handler(signum, frame):
@@ -41 +26 @@
         for i in input.split("\n"):
                 if i:
-                        fd.send(skype.send(i.strip()) + "\n")
+                        fd.send((skype.send(i.strip()) + "\n").encode(locale.getdefaultlocale()[1]))
         return True
 
@@ -81 +66 @@
         def Notify(self, msg_text):
                 global conn
-                text = utf8_decode(msg_text)
-                dprint('<< ' + text)
+                dprint('<< ' + msg_text)
                 if conn:
                         conn.send(msg_text + "\n")
@@ -92 +76 @@
                 dprint('>> ' + msg_text)
                 try:
-                        reply = utf8_decode(self.skype_api.Invoke(utf8_encode(msg_text)))
+                        reply = self.skype_api.Invoke(msg_text)
                 except dbus.exceptions.DBusException, s:
                         reply = str(s)