Changeset 1776

Timestamp:

10/05/04 11:41:13 (20 years ago)

Author:

jalet

Message:

Small fix for errors caused by unknown locale

Files:

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

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.126  2004/10/05 09:41:13  jalet
+# Small fix for errors caused by unknown locale
+#
 # Revision 1.125  2004/10/04 11:18:10  jalet
 # Now exports the MD5 sum of the job's datas as an hexadecimal digest
@@ -513 +516 @@
         # Else we use the current locale's one.
         # If nothing is set, we use ISO-8859-15 widely used in western Europe.
-        self.charset = charset or os.environ.get("CHARSET") or locale.getlocale()[1] or locale.getdefaultlocale()[1] or "ISO-8859-15"
+        localecharset = locale.getlocale()[1]
+        try :
+            localecharset = localecharset or locale.getdefaultlocale()[1]
+        except ValueError :    
+            pass        # Unknown locale, strange...
+        self.charset = charset or os.environ.get("CHARSET") or localecharset or "ISO-8859-15"
     
         # pykota specific stuff