diff options
| author | Thomas Robitaille <thomas.robitaille@gmail.com> | 2015-03-05 23:44:30 +0100 |
|---|---|---|
| committer | Thomas Robitaille <thomas.robitaille@gmail.com> | 2015-03-06 20:59:09 +0100 |
| commit | 2c3ef4cbe8af6fddd82d7e90433f92b23cbcdd37 (patch) | |
| tree | 88756495a1d32e4a55cd7edc943cf4cf8d32d399 /numpy/lib/tests/test__iotools.py | |
| parent | 4cba5310c7b8d1a3aab7202209d238f569a8f9ff (diff) | |
| download | numpy-2c3ef4cbe8af6fddd82d7e90433f92b23cbcdd37.tar.gz | |
BUG: genfromtxt gave OverflorError for large integers
Fix StringConverter to avoid OverflowError in genfromtxt. Before, int(2**66) would work
(and return a ‘long’) but then np.array([2**66], dtype=np.integer) would not work and
return an OverflowError which would propagate to genfromtxt. This commit fixes this by
ensuring testing in advance whether an OverflowError will occur. In addition, this adds
an explicit np.int64 entry on systems where integer means int32. Values larger than
2**63-1 will be cast as float. This includes a regression test and adds an entry to the
release notes.
Diffstat (limited to 'numpy/lib/tests/test__iotools.py')
| -rw-r--r-- | numpy/lib/tests/test__iotools.py | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/numpy/lib/tests/test__iotools.py b/numpy/lib/tests/test__iotools.py index 060f815d5..e0a917a21 100644 --- a/numpy/lib/tests/test__iotools.py +++ b/numpy/lib/tests/test__iotools.py @@ -152,17 +152,31 @@ class TestStringConverter(TestCase): def test_upgrade(self): "Tests the upgrade method." + converter = StringConverter() assert_equal(converter._status, 0) + # test int assert_equal(converter.upgrade(asbytes('0')), 0) assert_equal(converter._status, 1) + + # On systems where integer defaults to 32-bit, the statuses will be + # offset by one, so we check for this here. + import numpy.core.numeric as nx + status_offset = int(nx.dtype(nx.integer).itemsize < nx.dtype(nx.int64).itemsize) + + # test int > 2**32 + assert_equal(converter.upgrade(asbytes('17179869184')), 17179869184) + assert_equal(converter._status, 1 + status_offset) + # test float assert_allclose(converter.upgrade(asbytes('0.')), 0.0) - assert_equal(converter._status, 2) + assert_equal(converter._status, 2 + status_offset) + # test complex assert_equal(converter.upgrade(asbytes('0j')), complex('0j')) - assert_equal(converter._status, 3) + assert_equal(converter._status, 3 + status_offset) + # test str assert_equal(converter.upgrade(asbytes('a')), asbytes('a')) assert_equal(converter._status, len(converter._mapper) - 1) |