[Python-checkins] r70997 - python/trunk/Lib/test/test_csv.py

Wed Apr 1 23:26:19 CEST 2009

Author: r.david.murray
Date: Wed Apr 1 23:26:18 2009
New Revision: 70997
Log:
Add tests checking the CSV module's ability to handle
embedded newlines in quoted field values.
Modified:
 python/trunk/Lib/test/test_csv.py
Modified: python/trunk/Lib/test/test_csv.py
==============================================================================

--- python/trunk/Lib/test/test_csv.py	(original)
+++ python/trunk/Lib/test/test_csv.py	Wed Apr 1 23:26:18 2009
@@ -166,6 +166,8 @@
 quoting = csv.QUOTE_NONNUMERIC)
 self._write_test(['a',1,'p,q'], '"a","1","p,q"',
 quoting = csv.QUOTE_ALL)
+ self._write_test(['a\nb',1], '"a\nb","1"',
+ quoting = csv.QUOTE_ALL)
 
 def test_write_escape(self):
 self._write_test(['a',1,'p,q'], 'a,1,"p,q"',
@@ -245,6 +247,7 @@
 # will this fail where locale uses comma for decimals?
 self._read_test([',3,"5",7.3, 9'], [['', 3, '5', 7.3, 9]],
 quoting=csv.QUOTE_NONNUMERIC)
+ self._read_test(['"a\nb", 7'], [['a\nb', ' 7']])
 self.assertRaises(ValueError, self._read_test,
 ['abc,3'], [[]],
 quoting=csv.QUOTE_NONNUMERIC)
@@ -282,6 +285,21 @@
 self.assertRaises(StopIteration, r.next)
 self.assertEqual(r.line_num, 3)
 
+ def test_roundtrip_quoteed_newlines(self):
+ fd, name = tempfile.mkstemp()
+ fileobj = os.fdopen(fd, "w+b")
+ try:
+ writer = csv.writer(fileobj)
+ self.assertRaises(TypeError, writer.writerows, None)
+ rows = [['a\nb','b'],['c','x\r\nd']]
+ writer.writerows(rows)
+ fileobj.seek(0)
+ for i, row in enumerate(csv.reader(fileobj)):
+ self.assertEqual(row, rows[i])
+ finally:
+ fileobj.close()
+ os.unlink(name)
+
 class TestDialectRegistry(unittest.TestCase):
 def test_registry_badargs(self):
 self.assertRaises(TypeError, csv.list_dialects, None)
