[Python-checkins] r86940 - python/branches/py3k/Lib/test/test_csv.py
eric.araujo
python-checkins at python.org
Thu Dec 2 23:16:20 CET 2010
Author: eric.araujo
Date: Thu Dec 2 23:16:19 2010
New Revision: 86940
Log:
Fix wrong test code in test_csv (#10602)
Modified:
python/branches/py3k/Lib/test/test_csv.py
Modified: python/branches/py3k/Lib/test/test_csv.py
==============================================================================
--- python/branches/py3k/Lib/test/test_csv.py (original)
+++ python/branches/py3k/Lib/test/test_csv.py Thu Dec 2 23:16:19 2010
@@ -313,22 +313,17 @@
expected_dialects = csv.list_dialects() + [name]
expected_dialects.sort()
csv.register_dialect(name, myexceltsv)
- try:
- self.assertTrue(csv.get_dialect(name).delimiter, '\t')
- got_dialects = csv.list_dialects()
- got_dialects.sort()
- self.assertEqual(expected_dialects, got_dialects)
- finally:
- csv.unregister_dialect(name)
+ self.addCleanup(csv.unregister_dialect, name)
+ self.assertEqual(csv.get_dialect(name).delimiter, '\t')
+ got_dialects = sorted(csv.list_dialects())
+ self.assertEqual(expected_dialects, got_dialects)
def test_register_kwargs(self):
name = 'fedcba'
csv.register_dialect(name, delimiter=';')
- try:
- self.assertTrue(csv.get_dialect(name).delimiter, '\t')
- self.assertTrue(list(csv.reader('X;Y;Z', name)), ['X', 'Y', 'Z'])
- finally:
- csv.unregister_dialect(name)
+ self.addCleanup(csv.unregister_dialect, name)
+ self.assertEqual(csv.get_dialect(name).delimiter, ';')
+ self.assertEqual([['X', 'Y', 'Z']], list(csv.reader(['X;Y;Z'], name)))
def test_incomplete_dialect(self):
class myexceltsv(csv.Dialect):
More information about the Python-checkins
mailing list