[Python-checkins] python/nondist/sandbox/csv/test test_csv.py,1.3,1.4

davecole@users.sourceforge.net davecole@users.sourceforge.net
Sun, 02 Feb 2003 03:57:31 -0800


Update of /cvsroot/python/python/nondist/sandbox/csv/test
In directory sc8-pr-cvs1:/tmp/cvs-serv12500/test

Modified Files:
	test_csv.py 
Log Message:
Implemented lineterminator in _csv.
* Removed append of '\n' in csv.writer.write()
* Fixed tests to look for records terminated by '\r\n'.


Index: test_csv.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/csv/test/test_csv.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_csv.py	31 Jan 2003 21:30:43 -0000	1.3
--- test_csv.py	2 Feb 2003 11:57:28 -0000	1.4
***************
*** 98,114 ****
  
      def test_single(self):
!         self.writerAssertEqual([['abc']], 'abc\n')
  
      def test_simple(self):
!         self.writerAssertEqual([[1, 2, 'abc', 3, 4]], '1,2,abc,3,4\n')
  
      def test_quotes(self):
!         self.writerAssertEqual([[1, 2, 'a"bc"', 3, 4]], '1,2,"a""bc""",3,4\n')
  
      def test_quote_fieldsep(self):
!         self.writerAssertEqual([['abc,def']], '"abc,def"\n')
  
      def test_newlines(self):
!         self.writerAssertEqual([[1, 2, 'a\nbc', 3, 4]], '1,2,"a\nbc",3,4\n')
  
  class TestDictFields(unittest.TestCase):
--- 98,114 ----
  
      def test_single(self):
!         self.writerAssertEqual([['abc']], 'abc\r\n')
  
      def test_simple(self):
!         self.writerAssertEqual([[1, 2, 'abc', 3, 4]], '1,2,abc,3,4\r\n')
  
      def test_quotes(self):
!         self.writerAssertEqual([[1, 2, 'a"bc"', 3, 4]], '1,2,"a""bc""",3,4\r\n')
  
      def test_quote_fieldsep(self):
!         self.writerAssertEqual([['abc,def']], '"abc,def"\r\n')
  
      def test_newlines(self):
!         self.writerAssertEqual([[1, 2, 'a\nbc', 3, 4]], '1,2,"a\nbc",3,4\r\n')
  
  class TestDictFields(unittest.TestCase):
***************
*** 118,122 ****
                              fieldnames = ["f1", "f2", "f3"])
          writer.write({"f1": 10, "f3": "abc"})
!         self.assertEqual(fileobj.getvalue(), "10,,abc\n")
  
      def test_no_fields(self):
--- 118,122 ----
                              fieldnames = ["f1", "f2", "f3"])
          writer.write({"f1": 10, "f3": "abc"})
!         self.assertEqual(fileobj.getvalue(), "10,,abc\r\n")
  
      def test_no_fields(self):