Merged revisions 8812 via svnmerge from

mdboom · mdboom · commit c7e0a516e2f1 · 2010-11-30T17:37:39.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint ........ r8812 | mdboom | 2010-11-30 12:35:39 -0500 (Tue, 30 Nov 2010) | 2 lines [3109913] importing matplotlib changes string.letters ........ svn path=/trunk/matplotlib/; revision=8813
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -26,8 +26,11 @@
 # an encoding instead of a valid locale name.  Another
 # pathological case that has been reported is an empty string.
 
+# On some systems, getpreferredencoding sets the locale, which has
+# side effects.  Passing False eliminates those side effects.
+
 try:
-    preferredencoding = locale.getpreferredencoding().strip()
+    preferredencoding = locale.getpreferredencoding(False).strip()
     if not preferredencoding:
         preferredencoding = None
 except (ValueError, ImportError, AttributeError):
