diff options
| author | pierregm <pierregm@localhost> | 2009-10-12 04:45:31 +0000 |
|---|---|---|
| committer | pierregm <pierregm@localhost> | 2009-10-12 04:45:31 +0000 |
| commit | 80851e34d2955a331cecb9f50d2287d33618dd3e (patch) | |
| tree | a1c2ea17ef9f9192b1ad7839c31d7f73bc579bfe /numpy/lib/tests/test__iotools.py | |
| parent | 295e24af415bb49f12a632f0e27fb9e2a1099ea2 (diff) | |
| download | numpy-80851e34d2955a331cecb9f50d2287d33618dd3e.tar.gz | |
* _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
Diffstat (limited to 'numpy/lib/tests/test__iotools.py')
| -rw-r--r-- | numpy/lib/tests/test__iotools.py | 12 |
1 files changed, 12 insertions, 0 deletions
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)) #------------------------------------------------------------------------------- |