From: John Mandereau <john.mandereau@gmail.com>
Date: Thu, 31 Jan 2008 09:15:56 +0000 (+0100)
Subject: Keep lilylib.py:encoded_write() compatible with Python 2.4
X-Git-Tag: release/2.11.38-1~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3c4c3e43e393168cbccd1a476b7705acfc8b266c;p=lilypond.git

Keep lilylib.py:encoded_write() compatible with Python 2.4

UTF-8 output encoding may not be desired in all cases, but at least
this behavior is closest to the older one (i.e., calling gettext
instead of ugettext and having all POs encoded in UTF-8).
---

diff --git a/python/lilylib.py b/python/lilylib.py
index a512f2c6e5..ec38d70d73 100644
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -53,8 +53,11 @@ 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'))
 
 def stderr_write (s):
     encoded_write (sys.stderr, s)