summaryrefslogtreecommitdiff
path: root/numpy/lib/tests
diff options
context:
space:
mode:
authorRalf Gommers <ralf.gommers@googlemail.com>2011-04-03 12:33:07 +0200
committerRalf Gommers <ralf.gommers@googlemail.com>2011-04-03 13:02:14 +0200
commita311969ea2f47b486da14da99a26e72c12a0c20f (patch)
treef42c8786574e6f1929724cb6d541d41f9a5fafb3 /numpy/lib/tests
parente340e665adba35a5aba7fac09e28ac1f2e4d949b (diff)
downloadnumpy-a311969ea2f47b486da14da99a26e72c12a0c20f.tar.gz
ENH: add ndmin keyword to loadtxt. Closes #1562.
Thanks to Paul Anton Letnes and Derek Homeier.
Diffstat (limited to 'numpy/lib/tests')
-rw-r--r--numpy/lib/tests/test_io.py17
1 files changed, 17 insertions, 0 deletions
diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py
index 9afc5dd0b..30c0998dc 100644
--- a/numpy/lib/tests/test_io.py
+++ b/numpy/lib/tests/test_io.py
@@ -468,6 +468,23 @@ class TestLoadTxt(TestCase):
assert_array_equal(b, np.array([21, 35]))
assert_array_equal(c, np.array([ 72., 58.]))
+ def test_ndmin_keyword(self):
+ c = StringIO()
+ c.write(asbytes('1,2,3\n4,5,6'))
+ c.seek(0)
+ x = np.loadtxt(c, dtype=int, delimiter=',', ndmin=1)
+ a = np.array([[1, 2, 3], [4, 5, 6]])
+ assert_array_equal(x, a)
+ d = StringIO()
+ d.write(asbytes('0,1,2'))
+ d.seek(0)
+ x = np.loadtxt(d, dtype=int, delimiter=',', ndmin=2)
+ assert_(x.shape == (3, 1))
+ assert_raises(ValueError, np.loadtxt, d, ndmin=3)
+ assert_raises(ValueError, np.loadtxt, d, ndmin=1.5)
+ e = StringIO()
+ assert_(np.loadtxt(e, ndmin=2).shape == (0, 1,))
+
class Testfromregex(TestCase):
def test_record(self):