From 5137d648cd5b586d1f7063ce9e625cb6c2996704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Thu, 2 Dec 2010 22:16:19 +0000 Subject: Fix wrong test code in test_csv (#10602) --- Lib/test/test_csv.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index c3da185..8ca1e62 100644 --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -313,22 +313,17 @@ class TestDialectRegistry(unittest.TestCase): 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): -- cgit v0.12