Merge pull request matplotlib#593 from mdboom/recursive_import

mdboom · mdboom · commit 62073cfa10e9 · 2011-11-28T04:28:39.000-08:00
recursive import : bug in cbook.unicode_safe
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -28,15 +28,18 @@
 # On some systems, getpreferredencoding sets the locale, which has
 # side effects.  Passing False eliminates those side effects.
 
-try:
-    preferredencoding = locale.getpreferredencoding(
-        matplotlib.rcParams['axes.formatter.use_locale']).strip()
-    if not preferredencoding:
-        preferredencoding = None
-except (ValueError, ImportError, AttributeError):
-    preferredencoding = None
 
 def unicode_safe(s):
+    import matplotlib
+
+    try:
+        preferredencoding = locale.getpreferredencoding(
+            matplotlib.rcParams['axes.formatter.use_locale']).strip()
+        if not preferredencoding:
+            preferredencoding = None
+    except (ValueError, ImportError, AttributeError):
+        preferredencoding = None
+
     if preferredencoding is None: return unicode(s)
     else: return unicode(s, preferredencoding)
 
