@@ -161,9 +161,9 @@ def test_skip_bad_lines(self):
161161 error_bad_lines = False ,
162162 warn_bad_lines = False )
163163 result = reader .read ()
164- expected = {0 : ['a' , 'd' , 'g' , 'l' ],
165- 1 : ['b' , 'e' , 'h' , 'm' ],
166- 2 : ['c' , 'f' , 'i' , 'n' ]}
164+ expected = {0 : np . array ( ['a' , 'd' , 'g' , 'l' ], dtype = object ) ,
165+ 1 : np . array ( ['b' , 'e' , 'h' , 'm' ], dtype = object ) ,
166+ 2 : np . array ( ['c' , 'f' , 'i' , 'n' ], dtype = object ) }
167167 assert_array_dicts_equal (result , expected )
168168
169169 reader = TextReader (StringIO (data ), delimiter = ':' ,
@@ -189,8 +189,10 @@ def test_header_not_enough_lines(self):
189189 assert header == expected
190190
191191 recs = reader .read ()
192- expected = {0 : [1 , 4 ], 1 : [2 , 5 ], 2 : [3 , 6 ]}
193- assert_array_dicts_equal (expected , recs )
192+ expected = {0 : np .array ([1 , 4 ], dtype = np .int64 ),
193+ 1 : np .array ([2 , 5 ], dtype = np .int64 ),
194+ 2 : np .array ([3 , 6 ], dtype = np .int64 )}
195+ assert_array_dicts_equal (recs , expected )
194196
195197 # not enough rows
196198 pytest .raises (parser .ParserError , TextReader , StringIO (data ),
@@ -203,14 +205,16 @@ def test_header_not_enough_lines_as_recarray(self):
203205 '1,2,3\n '
204206 '4,5,6' )
205207
206- reader = TextReader (StringIO (data ), delimiter = ',' , header = 2 ,
207- as_recarray = True )
208+ reader = TextReader (StringIO (data ), delimiter = ',' ,
209+ header = 2 , as_recarray = True )
208210 header = reader .header
209211 expected = [['a' , 'b' , 'c' ]]
210212 assert header == expected
211213
212214 recs = reader .read ()
213- expected = {'a' : [1 , 4 ], 'b' : [2 , 5 ], 'c' : [3 , 6 ]}
215+ expected = {'a' : np .array ([1 , 4 ], dtype = np .int64 ),
216+ 'b' : np .array ([2 , 5 ], dtype = np .int64 ),
217+ 'c' : np .array ([3 , 6 ], dtype = np .int64 )}
214218 assert_array_dicts_equal (expected , recs )
215219
216220 # not enough rows
@@ -225,7 +229,7 @@ def test_escapechar(self):
225229 reader = TextReader (StringIO (data ), delimiter = ',' , header = None ,
226230 escapechar = '\\ ' )
227231 result = reader .read ()
228- expected = {0 : ['"hello world"' ] * 3 }
232+ expected = {0 : np . array ( ['"hello world"' ] * 3 , dtype = object ) }
229233 assert_array_dicts_equal (result , expected )
230234
231235 def test_eof_has_eol (self ):
@@ -360,7 +364,7 @@ def test_empty_field_eof(self):
360364
361365 result = TextReader (StringIO (data ), delimiter = ',' ).read ()
362366
363- expected = {0 : np .array ([1 , 4 ]),
367+ expected = {0 : np .array ([1 , 4 ], dtype = np . int64 ),
364368 1 : np .array (['2' , '' ], dtype = object ),
365369 2 : np .array (['3' , '' ], dtype = object )}
366370 assert_array_dicts_equal (result , expected )
@@ -397,4 +401,5 @@ def test_empty_csv_input(self):
397401
398402def assert_array_dicts_equal (left , right ):
399403 for k , v in compat .iteritems (left ):
400- assert (np .array_equal (v , right [k ]))
404+ assert tm .assert_numpy_array_equal (np .asarray (v ),
405+ np .asarray (right [k ]))
0 commit comments