Merge pull request #2436 from mdboom/locale-explicit-exception

pelson · pelson · commit 3e61c81c6142 · 2013-09-18T08:54:50.000-07:00
Catch explicit exceptions when setting locale.
diff --git a/lib/matplotlib/tests/__init__.py b/lib/matplotlib/tests/__init__.py
@@ -15,10 +15,10 @@ def setup():
 
     try:
         locale.setlocale(locale.LC_ALL, str('en_US.UTF-8'))
-    except:
+    except locale.Error:
         try:
             locale.setlocale(locale.LC_ALL, str('English_United States.1252'))
-        except:
+        except locale.Error:
             warnings.warn(
                 "Could not set locale to English/United States. "
                 "Some date-related tests may fail")
