summaryrefslogtreecommitdiff
path: root/numpy/lib
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2011-02-08 06:09:35 -0700
committerCharles Harris <charlesr.harris@gmail.com>2011-02-08 06:09:35 -0700
commit1d952a5991bbea1b41b8a0b1a2f85349db51e2bc (patch)
tree67f5d16396a5f7244427fa559673c245ea1cbc2a /numpy/lib
parent51d10b0bed24fea5a65b1981da1a38ea91045345 (diff)
parentb8921fcae1a6a9d56a477e833f78a81ffa3b1d5e (diff)
downloadnumpy-1d952a5991bbea1b41b8a0b1a2f85349db51e2bc.tar.gz
Merge branch 'array_params_from_object' of https://github.com/m-paradox/numpy into params_from_object
Diffstat (limited to 'numpy/lib')
-rw-r--r--numpy/lib/tests/test_io.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py
index 04497dee8..5001f6bac 100644
--- a/numpy/lib/tests/test_io.py
+++ b/numpy/lib/tests/test_io.py
@@ -1050,7 +1050,7 @@ M 33 21.99
converters = {4: lambda x:"(%s)" % x}
kwargs = dict(delimiter=",", converters=converters,
dtype=[(_, int) for _ in 'abcde'],)
- assert_raises(TypeError, np.genfromtxt, mdata, **kwargs)
+ assert_raises(ValueError, np.genfromtxt, mdata, **kwargs)
def test_default_field_format(self):