[Python-checkins] python/nondist/sandbox/csv/test test_csv.py,1.23,1.24

andrewmcnamara@users.sourceforge.net andrewmcnamara@users.sourceforge.net
Mon, 10 Feb 2003 00:40:10 -0800


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

Modified Files:
	test_csv.py 
Log Message:
Turned Dialect struct into a fully fledged Python type and moved
dialect/keyword parsing onto it's init function. ReaderObj and WriterObj
now contain pointers to objects of this type, and have a "dialect" 
attribute - this made several things cleaner. Switched Reader_Type 
and Writer_Type to use 2.2 style attribute access - this allows better
introspection.


Index: test_csv.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/csv/test/test_csv.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** test_csv.py	10 Feb 2003 03:48:03 -0000	1.23
--- test_csv.py	10 Feb 2003 08:40:07 -0000	1.24
***************
*** 33,43 ****
  
      def _test_attrs(self, obj):
!         self.assertEqual(obj.delimiter, ',')
!         obj.delimiter = '\t'
!         self.assertEqual(obj.delimiter, '\t')
!         self.assertRaises(AttributeError, delattr, obj, 'delimiter')
!         self.assertRaises(TypeError, setattr, obj, 'lineterminator', None)
!         obj.escapechar = None
!         self.assertEqual(obj.escapechar, None)
  
      def test_reader_attrs(self):
--- 33,44 ----
  
      def _test_attrs(self, obj):
!         self.assertEqual(obj.dialect.delimiter, ',')
!         obj.dialect.delimiter = '\t'
!         self.assertEqual(obj.dialect.delimiter, '\t')
!         self.assertRaises(TypeError, delattr, obj.dialect, 'delimiter')
!         self.assertRaises(TypeError, setattr, obj.dialect, 
!                           'lineterminator', None)
!         obj.dialect.escapechar = None
!         self.assertEqual(obj.dialect.escapechar, None)
  
      def test_reader_attrs(self):
***************
*** 51,55 ****
          writer = csv.writer(fileobj, **kwargs)
          writer.writerow(fields)
!         self.assertEqual(fileobj.getvalue(), expect + writer.lineterminator)
  
      def test_write_arg_valid(self):
--- 52,57 ----
          writer = csv.writer(fileobj, **kwargs)
          writer.writerow(fields)
!         self.assertEqual(fileobj.getvalue(), 
!                          expect + writer.dialect.lineterminator)
  
      def test_write_arg_valid(self):