Changeset 2807

Timestamp:

03/25/06 23:21:46 (18 years ago)

Author:

jerome

Message:

Backported unicode fix from pykoticon

Files:

• pykota/trunk/pykota/tool.py (modified) (2 diffs)

pykota/trunk/pykota/tool.py

@@ -242 +242 @@
             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
         
@@ -255 +258 @@
             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