1 files changed, 15 insertions, 38 deletions
diff --git a/numpy/core/tests/test_print.py b/numpy/core/tests/test_print.py
index 6ebb4733c..f432711a9 100644
--- a/numpy/core/tests/test_print.py
+++ b/numpy/core/tests/test_print.py
@@ -2,12 +2,14 @@ from __future__ import division, absolute_import, print_function
 
 import sys
 import locale
+import contextlib
 import nose
 
 import numpy as np
 from numpy.testing import (
-    run_module_suite, assert_, assert_equal, SkipTest
+    run_module_suite, assert_, assert_equal, SkipTest, dec
 )
+from ._locales import CommaDecimalPointLocale
 
 
 if sys.version_info[0] >= 3:
@@ -201,46 +203,21 @@ def test_scalar_format():
                             (fmat, repr(val), repr(valtype), str(e)))
 
 
+#
 # Locale tests: scalar types formatting should be independent of the locale
-def in_foreign_locale(func):
-    """
-    Swap LC_NUMERIC locale to one in which the decimal point is ',' and not '.'
-    If not possible, raise SkipTest
+#
 
-    """
-    if sys.platform == 'win32':
-        locales = ['FRENCH']
-    else:
-        locales = ['fr_FR', 'fr_FR.UTF-8', 'fi_FI', 'fi_FI.UTF-8']
+class TestCommaDecimalPointLocale(CommaDecimalPointLocale):
+
+    def test_locale_single(self):
+        assert_equal(str(np.float32(1.2)), str(float(1.2)))
+
+    def test_locale_double(self):
+        assert_equal(str(np.double(1.2)), str(float(1.2)))
+
+    def test_locale_longdouble(self):
+        assert_equal(str(np.longdouble('1.2')), str(float(1.2)))
 
-    def wrapper(*args, **kwargs):
-        curloc = locale.getlocale(locale.LC_NUMERIC)
-        try:
-            for loc in locales:
-                try:
-                    locale.setlocale(locale.LC_NUMERIC, loc)
-                    break
-                except locale.Error:
-                    pass
-            else:
-                raise SkipTest("Skipping locale test, because "
-                                "French locale not found")
-            return func(*args, **kwargs)
-        finally:
-            locale.setlocale(locale.LC_NUMERIC, locale=curloc)
-    return nose.tools.make_decorator(func)(wrapper)
-
-@in_foreign_locale
-def test_locale_single():
-    assert_equal(str(np.float32(1.2)), str(float(1.2)))
-
-@in_foreign_locale
-def test_locale_double():
-    assert_equal(str(np.double(1.2)), str(float(1.2)))
-
-@in_foreign_locale
-def test_locale_longdouble():
-    assert_equal(str(np.longdouble('1.2')), str(float(1.2)))
 
 if __name__ == "__main__":
     run_module_suite()