Changeset 2195 for pykota/trunk

Timestamp:

04/06/05 11:49:53 (20 years ago)

Author:

jerome

Message:

Fixed charset problem under MacOSX

Location:

pykota/trunk

Files:

• NEWS (modified) (1 diff)
• pykota/tool.py (modified) (1 diff)

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.22alpha4 :
     
+        - Fixed charset problem under MacOSX.
+        
         - Allows pkbanner to accept more info to display on its 
           command line.

pykota/trunk/pykota/tool.py

@@ -92 +92 @@
         try :
             try :
-                # preferred method with Python 2.3 and up
-                localecharset = locale.getpreferredencoding()
+                localecharset = locale.nl_langinfo(locale.CODESET)
             except AttributeError :    
-                localecharset = locale.getlocale()[1]
                 try :
-                    localecharset = localecharset or locale.getdefaultlocale()[1]
-                except ValueError :    
-                    pass        # Unknown locale, strange...
+                    localecharset = locale.getpreferredencoding()
+                except AttributeError :    
+                    localecharset = locale.getlocale()[1]
+                    try :
+                        localecharset = localecharset or locale.getdefaultlocale()[1]
+                    except ValueError :    
+                        pass        # Unknown locale, strange...
         except locale.Error :            
             pass