Improve Python scripts localization

[lilypond.git] / python / lilylib.py

diff --git a/python/lilylib.py b/python/lilylib.py
index a512f2c6e5494098b5cfb4aaca2ffe5a6d21746b..cfa5e67d0a7b0de58428f76b3ea96efac1cecdc1 100644 (file)
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -53,8 +53,16 @@ except:
        return s
 underscore = _
 
+# Urg, Python 2.4 does not define stderr/stdout encoding
+# Maybe guess encoding from LANG/LC_ALL/LC_CTYPE?
+
 def encoded_write(f, s):
-    f.write (s.encode (f.encoding))
+    f.write (s.encode (f.encoding or 'utf_8'))
+
+# ugh, Python 2.5 optparse requires Unicode strings in some argument
+# functions, and refuse them in some other places
+def display_encode (s):
+    return s.encode (sys.stderr.encoding or 'utf_8')
 
 def stderr_write (s):
     encoded_write (sys.stderr, s)