@@ -297,13 +297,18 @@ def test_read_oddinputs(self):
297297 [b'abc' ], None )
298298
299299 def test_read_eol (self ):
300- self ._read_test (['a,b' ], [['a' ,'b' ]])
301- self ._read_test (['a,b\n ' ], [['a' ,'b' ]])
302- self ._read_test (['a,b\r \n ' ], [['a' ,'b' ]])
303- self ._read_test (['a,b\r ' ], [['a' ,'b' ]])
304- self .assertRaises (csv .Error , self ._read_test , ['a,b\r c,d' ], [])
305- self .assertRaises (csv .Error , self ._read_test , ['a,b\n c,d' ], [])
306- self .assertRaises (csv .Error , self ._read_test , ['a,b\r \n c,d' ], [])
300+ self ._read_test (['a,b' , 'c,d' ], [['a' ,'b' ], ['c' ,'d' ]])
301+ self ._read_test (['a,b\n ' , 'c,d\n ' ], [['a' ,'b' ], ['c' ,'d' ]])
302+ self ._read_test (['a,b\r \n ' , 'c,d\r \n ' ], [['a' ,'b' ], ['c' ,'d' ]])
303+ self ._read_test (['a,b\r ' , 'c,d\r ' ], [['a' ,'b' ], ['c' ,'d' ]])
304+
305+ errmsg = "with newline=''"
306+ with self .assertRaisesRegex (csv .Error , errmsg ):
307+ next (csv .reader (['a,b\r c,d' ]))
308+ with self .assertRaisesRegex (csv .Error , errmsg ):
309+ next (csv .reader (['a,b\n c,d' ]))
310+ with self .assertRaisesRegex (csv .Error , errmsg ):
311+ next (csv .reader (['a,b\r \n c,d' ]))
307312
308313 def test_read_eof (self ):
309314 self ._read_test (['a,"' ], [['a' , '' ]])
0 commit comments