[Python-checkins] python/nondist/sandbox/csv/test test_csv.py,1.9,1.10

[montanaro@users.sourceforge.net]

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

Modified Files:
	test_csv.py 
Log Message:
write()/writelines()/CSVError -> writerow()/writerows()/Error

added simple test passing Dialect instance instead of string


Index: test_csv.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/csv/test/test_csv.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** test_csv.py	3 Feb 2003 02:56:20 -0000	1.9
--- test_csv.py	3 Feb 2003 06:45:59 -0000	1.10
***************
*** 16,20 ****
          fileobj = StringIO()
          writer = csv.writer(fileobj, dialect = self.dialect)
!         writer.writelines(input)
          self.assertEqual(fileobj.getvalue(), expected_result)
  
--- 16,20 ----
          fileobj = StringIO()
          writer = csv.writer(fileobj, dialect = self.dialect)
!         writer.writerows(input)
          self.assertEqual(fileobj.getvalue(), expected_result)
  
***************
*** 117,121 ****
          writer = csv.writer(fileobj, dialect="excel",
                              fieldnames = ["f1", "f2", "f3"])
!         writer.write({"f1": 10, "f3": "abc"})
          self.assertEqual(fileobj.getvalue(), "10,,abc\r\n")
  
--- 117,121 ----
          writer = csv.writer(fileobj, dialect="excel",
                              fieldnames = ["f1", "f2", "f3"])
!         writer.writerow({"f1": 10, "f3": "abc"})
          self.assertEqual(fileobj.getvalue(), "10,,abc\r\n")
  
***************
*** 123,127 ****
          fileobj = StringIO()
          writer = csv.writer(fileobj, dialect="excel")
!         self.assertRaises(csv.CSVError, writer.write, {"f1": 10, "f3": "abc"})
  
  class TestArrayWrites(unittest.TestCase):
--- 123,127 ----
          fileobj = StringIO()
          writer = csv.writer(fileobj, dialect="excel")
!         self.assertRaises(csv.Error, writer.writerow, {"f1": 10, "f3": "abc"})
  
  class TestArrayWrites(unittest.TestCase):
***************
*** 132,136 ****
          fileobj = StringIO()
          writer = csv.writer(fileobj, dialect="excel")
!         writer.write(a)
          expected = ",".join([str(i) for i in a])+"\r\n"
          self.assertEqual(fileobj.getvalue(), expected)
--- 132,136 ----
          fileobj = StringIO()
          writer = csv.writer(fileobj, dialect="excel")
!         writer.writerow(a)
          expected = ",".join([str(i) for i in a])+"\r\n"
          self.assertEqual(fileobj.getvalue(), expected)
***************
*** 142,146 ****
          fileobj = StringIO()
          writer = csv.writer(fileobj, dialect="excel")
!         writer.write(a)
          expected = ",".join([str(i) for i in a])+"\r\n"
          self.assertEqual(fileobj.getvalue(), expected)
--- 142,146 ----
          fileobj = StringIO()
          writer = csv.writer(fileobj, dialect="excel")
!         writer.writerow(a)
          expected = ",".join([str(i) for i in a])+"\r\n"
          self.assertEqual(fileobj.getvalue(), expected)
***************
*** 152,156 ****
          fileobj = StringIO()
          writer = csv.writer(fileobj, dialect="excel")
!         writer.write(a)
          expected = ",".join([str(i) for i in a])+"\r\n"
          self.assertEqual(fileobj.getvalue(), expected)
--- 152,156 ----
          fileobj = StringIO()
          writer = csv.writer(fileobj, dialect="excel")
!         writer.writerow(a)
          expected = ",".join([str(i) for i in a])+"\r\n"
          self.assertEqual(fileobj.getvalue(), expected)
***************
*** 161,165 ****
          fileobj = StringIO()
          writer = csv.writer(fileobj, dialect="excel")
!         writer.write(a)
          expected = ",".join(a)+"\r\n"
          self.assertEqual(fileobj.getvalue(), expected)
--- 161,165 ----
          fileobj = StringIO()
          writer = csv.writer(fileobj, dialect="excel")
!         writer.writerow(a)
          expected = ",".join(a)+"\r\n"
          self.assertEqual(fileobj.getvalue(), expected)
***************
*** 184,187 ****
--- 184,196 ----
                            "myexceltsv", myexceltsv)
  
+     def test_dialect_class(self):
+         class myexceltsv(csv.Dialect):
+             delimiter = "\t"
+         fileobj = StringIO()
+         writer = csv.writer(fileobj, dialect=myexceltsv())
+         writer.writerow([1,2,3])
+         self.assertEqual(fileobj.getvalue(), "1\t2\t3\r\n")
+ 
+             
  def _testclasses():
      mod = sys.modules[__name__]