Revision: 8813
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8813&view=rev
Author: mdboom
Date: 2010-11-30 17:37:39 +0000 (Tue, 30 Nov 2010)
Log Message:
-----------
Merged revisions 8812 via svnmerge from
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
........
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/cbook.py
Property Changed:
----------------
trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428
/branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8810
/trunk/matplotlib:1-7315
+ /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428
/branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8812
/trunk/matplotlib:1-7315
Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/cbook.py 2010-11-30 17:35:39 UTC (rev
8812)
+++ trunk/matplotlib/lib/matplotlib/cbook.py 2010-11-30 17:37:39 UTC (rev
8813)
@@ -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):
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
