From 80851e34d2955a331cecb9f50d2287d33618dd3e Mon Sep 17 00:00:00 2001 From: pierregm Date: Mon, 12 Oct 2009 04:45:31 +0000 Subject: * _iotools.StringConverter - prevents an explicit default to be overwritten during upgrade * io.genfromtxt - deprecate `skiprows` for `skip_header` - deprecate `missing` for `missing_values` - `missing_values` can now be a sequence - add support for `filling_values` * fixed ticket #1257 --- numpy/lib/tests/test__iotools.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'numpy/lib/tests/test__iotools.py') diff --git a/numpy/lib/tests/test__iotools.py b/numpy/lib/tests/test__iotools.py index c16491aee..ed0f4dc63 100644 --- a/numpy/lib/tests/test__iotools.py +++ b/numpy/lib/tests/test__iotools.py @@ -179,6 +179,18 @@ class TestStringConverter(TestCase): conv = StringConverter(lambda s: date(*(time.strptime(s)[:3]))) assert_equal(conv._mapper[-2][0](0), 0j) assert(hasattr(conv, 'default')) + # + def test_keep_default(self): + "Make sure we don't lose an explicit default" + converter = StringConverter(None, missing_values='', default=-999) + converter.upgrade('3.14159265') + assert_equal(converter.default, -999) + assert_equal(converter.type, np.dtype(float)) + # + converter = StringConverter(None, missing_values='', default=0) + converter.upgrade('3.14159265') + assert_equal(converter.default, 0) + assert_equal(converter.type, np.dtype(float)) #------------------------------------------------------------------------------- -- cgit v1.2.1