Changeset 3020

Timestamp:

09/19/06 00:52:34 (18 years ago)

Author:

jerome

Message:

Removed unneeded code to retrieve the correct character set.

Files:

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

pykota/trunk/pykota/tool.py

@@ -141 +141 @@
             gettext.NullTranslations().install()
             
-        # We can force the charset.    
-        # The CHARSET environment variable is set by CUPS when printing.
-        # Else we use the current locale's one.
-        # If nothing is set, we use ISO-8859-15 widely used in western Europe.
-        self.localecharset = None
-        try :
+        # Finds the correct charset
+        self.localecharset = sys.getfilesystemencoding()
+        if self.localecharset is None :
             try :
-                self.localecharset = locale.nl_langinfo(locale.CODESET)
-            except AttributeError :    
                 try :
                     self.localecharset = locale.getpreferredencoding()
@@ -158 +153 @@
                     except ValueError :    
                         pass        # Unknown locale, strange...
-        except locale.Error :            
-            pass
-        self.charset = charset or self.localecharset or "ISO-8859-15"
+            except locale.Error :            
+                pass
+        self.charset = charset or self.localecharset or "UTF-8"
     
         # pykota specific stuff