Changeset 113

Timestamp:

03/25/06 23:00:29 (19 years ago)

Author:

jerome

Message:

Fixed unicode problem.

Files:

• pykoticon/trunk/bin/pykoticon (modified) (4 diffs)

pykoticon/trunk/bin/pykoticon

@@ -111 +111 @@
         values = {}
         for (k, v) in varvalues.items() :
-            values[k] = v.data
+            values[k] = self.frame.UTF8ToUserCharset(v.data)
         wx.CallAfter(self.frame.askDatas, [ self.frame.UTF8ToUserCharset(v.data) for v in labels ], \
                                           varnames, \
-                                          [ self.frame.UTF8ToUserCharset(v.data) for v in values])
+                                          values)
         # ugly, isn't it ?
         while self.frame.dialogAnswer is None :
@@ -338 +338 @@
         self.charset = charset
         self.port = localport
-        self.server = MyXMLRPCServer(self, printserver, localport)
+        self.server = MyXMLRPCServer(self, printserver, localport, debug=True)
         
     def UTF8ToUserCharset(self, text) :
@@ -345 +345 @@
             try :
                 return unicode(text, "UTF-8").encode(self.charset) 
-            except UnicodeError :    
+            except (UnicodeError, TypeError) :    
                 try :
                     # Incorrect locale settings ?
                     return unicode(text, "UTF-8").encode("ISO-8859-15") 
-                except UnicodeError :    
-                    pass
+                except (UnicodeError, TypeError) :    
+                    try :
+                        return text.encode(self.charset) 
+                    except (UnicodeError, TypeError, AttributeError) :
+                        pass
         return text
         
@@ -358 +361 @@
             try :
                 return unicode(text, self.charset).encode("UTF-8") 
-            except UnicodeError :    
+            except (UnicodeError, TypeError) :    
                 try :
                     # Incorrect locale settings ?
                     return unicode(text, "ISO-8859-15").encode("UTF-8") 
-                except UnicodeError :    
-                    pass
+                except (UnicodeError, TypeError) :    
+                    try :
+                        return text.encode("UTF-8") 
+                    except (UnicodeError, TypeError, AttributeError) :
+                        pass
         return text