From a4bf549af4f2806d3748671bfe9ee5d21b3c7d8a Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Mon, 7 Oct 2013 18:20:31 -0400 Subject: [PATCH] Use assertIsInstance instead of assertTrue(type(x) == y) --- .../lib/xmodule/xmodule/tests/test_annotatable_module.py | 8 ++++---- lms/djangoapps/bulk_email/tests/test_err_handling.py | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/lib/xmodule/xmodule/tests/test_annotatable_module.py b/common/lib/xmodule/xmodule/tests/test_annotatable_module.py index 2b454ff45b..ae65eb66d6 100644 --- a/common/lib/xmodule/xmodule/tests/test_annotatable_module.py +++ b/common/lib/xmodule/xmodule/tests/test_annotatable_module.py @@ -52,7 +52,7 @@ class AnnotatableModuleTestCase(unittest.TestCase): actual_attr = self.annotatable._get_annotation_data_attr(0, el) - self.assertTrue(type(actual_attr) is dict) + self.assertIsInstance(actual_attr, dict) self.assertDictEqual(expected_attr, actual_attr) def test_annotation_class_attr_default(self): @@ -62,7 +62,7 @@ class AnnotatableModuleTestCase(unittest.TestCase): expected_attr = { 'class': { 'value': 'annotatable-span highlight' } } actual_attr = self.annotatable._get_annotation_class_attr(0, el) - self.assertTrue(type(actual_attr) is dict) + self.assertIsInstance(actual_attr, dict) self.assertDictEqual(expected_attr, actual_attr) def test_annotation_class_attr_with_valid_highlight(self): @@ -78,7 +78,7 @@ class AnnotatableModuleTestCase(unittest.TestCase): } actual_attr = self.annotatable._get_annotation_class_attr(0, el) - self.assertTrue(type(actual_attr) is dict) + self.assertIsInstance(actual_attr, dict) self.assertDictEqual(expected_attr, actual_attr) def test_annotation_class_attr_with_invalid_highlight(self): @@ -92,7 +92,7 @@ class AnnotatableModuleTestCase(unittest.TestCase): } actual_attr = self.annotatable._get_annotation_class_attr(0, el) - self.assertTrue(type(actual_attr) is dict) + self.assertIsInstance(actual_attr, dict) self.assertDictEqual(expected_attr, actual_attr) def test_render_annotation(self): diff --git a/lms/djangoapps/bulk_email/tests/test_err_handling.py b/lms/djangoapps/bulk_email/tests/test_err_handling.py index abdbf4dc3b..99d91eab3f 100644 --- a/lms/djangoapps/bulk_email/tests/test_err_handling.py +++ b/lms/djangoapps/bulk_email/tests/test_err_handling.py @@ -61,7 +61,7 @@ class TestEmailErrors(ModuleStoreTestCase): self.assertTrue(retry.called) (_, kwargs) = retry.call_args exc = kwargs['exc'] - self.assertTrue(type(exc) == SMTPDataError) + self.assertIsInstance(exc, SMTPDataError) @patch('bulk_email.tasks.get_connection', autospec=True) @patch('bulk_email.tasks.course_email_result') @@ -110,7 +110,7 @@ class TestEmailErrors(ModuleStoreTestCase): self.assertTrue(retry.called) (_, kwargs) = retry.call_args exc = kwargs['exc'] - self.assertTrue(type(exc) == SMTPServerDisconnected) + self.assertIsInstance(exc, SMTPServerDisconnected) @patch('bulk_email.tasks.get_connection', autospec=True) @patch('bulk_email.tasks.course_email.retry') @@ -131,7 +131,7 @@ class TestEmailErrors(ModuleStoreTestCase): self.assertTrue(retry.called) (_, kwargs) = retry.call_args exc = kwargs['exc'] - self.assertTrue(type(exc) == SMTPConnectError) + self.assertIsInstance(exc, SMTPConnectError) @patch('bulk_email.tasks.course_email_result') @patch('bulk_email.tasks.course_email.retry')