fixed a locale encoding bug described in sf bug#1744154

jdh2358 · jdh2358 · commit 0b19380802db · 2007-06-27T20:13:53.000Z
svn path=/trunk/matplotlib/; revision=3420
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -3,7 +3,7 @@
 from the Python Cookbook -- hence the name cbook
 """
 from __future__ import generators
-import re, os, errno, sys, StringIO, traceback
+import re, os, errno, sys, StringIO, traceback, locale
 import time, datetime
 import numpy as npy
 
@@ -14,6 +14,13 @@
 major, minor1, minor2, s, tmp = sys.version_info
 
 
+# on some systems, locale.getpreferredencoding returns None, which can break unicode
+preferredencoding = locale.getpreferredencoding()
+
+def unicode_safe(s):
+    if preferredencoding is None: return unicode(s)
+    else: return unicode(s, preferredencoding)
+
 class converter:
     """
     Base class for handling string -> python type with support for
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -92,6 +92,8 @@
 from dateutil.relativedelta import relativedelta
 import dateutil.parser
 
+from matplotlib import cbook
+
 UTC = timezone('UTC')
 
 def _get_rc_timezone():
@@ -295,7 +297,7 @@ def strftime(self, dt, fmt):
         fmt = self.illegal_s.sub(r"\1", fmt)
         fmt = fmt.replace("%s", "s")
         if dt.year > 1900:
-            return unicode(dt.strftime(fmt), locale.getpreferredencoding())
+            return cbook.unicode_safe(dt.strftime(fmt))
 
         year = dt.year
         # For every non-leap year century, advance by
@@ -323,7 +325,9 @@ def strftime(self, dt, fmt):
         for site in sites:
             s = s[:site] + syear + s[site+4:]
 
-        return unicode(s, locale.getpreferredencoding())
+        return cbook.unicode_safe(s)
+
+
 
 class IndexDateFormatter(Formatter):
     """
@@ -347,7 +351,7 @@ def __call__(self, x, pos=0):
 
         dt = num2date(self.t[ind], self.tz)
 
-        return unicode(dt.strftime(self.fmt), locale.getpreferredencoding())
+        return cbook.unicode_safe(dt.strftime(self.fmt))
 
 
 class AutoDateFormatter(Formatter):
