From 8f1f4ad82ae584dbcda6bde478e77eaeb27b9452 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Mon, 1 Jun 2015 19:10:00 +0100 Subject: [PATCH] Use assertIsInstance instead of assertTrue(isinstance) --- wagtail/wagtailembeds/tests.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py index f09af16402..ab28dec415 100644 --- a/wagtail/wagtailembeds/tests.py +++ b/wagtail/wagtailembeds/tests.py @@ -320,7 +320,7 @@ class TestEmbedBlock(TestCase): block = EmbedBlock(required=False) block_val = block.to_python('http://www.example.com/foo') - self.assertTrue(isinstance(block_val, EmbedValue)) + self.assertIsInstance(block_val, EmbedValue) self.assertEqual(block_val.url, 'http://www.example.com/foo') # empty values should yield None @@ -398,7 +398,7 @@ class TestEmbedBlock(TestCase): block = EmbedBlock(required=False) block_val = block.value_from_datadict({'myembed': 'http://www.example.com/foo'}, {}, prefix='myembed') - self.assertTrue(isinstance(block_val, EmbedValue)) + self.assertIsInstance(block_val, EmbedValue) self.assertEqual(block_val.url, 'http://www.example.com/foo') # empty value should result in None @@ -416,11 +416,11 @@ class TestEmbedBlock(TestCase): self.assertEqual(block3.get_default(), None) block4 = EmbedBlock(default='http://www.example.com/foo') - self.assertTrue(isinstance(block4.get_default(), EmbedValue)) + self.assertIsInstance(block4.get_default(), EmbedValue) self.assertEqual(block4.get_default().url, 'http://www.example.com/foo') block5 = EmbedBlock(default=EmbedValue('http://www.example.com/foo')) - self.assertTrue(isinstance(block5.get_default(), EmbedValue)) + self.assertIsInstance(block5.get_default(), EmbedValue) self.assertEqual(block5.get_default().url, 'http://www.example.com/foo') def test_clean(self): @@ -429,11 +429,11 @@ class TestEmbedBlock(TestCase): # a valid EmbedValue should return the same value on clean cleaned_value = required_block.clean(EmbedValue('http://www.example.com/foo')) - self.assertTrue(isinstance(cleaned_value, EmbedValue)) + self.assertIsInstance(cleaned_value, EmbedValue) self.assertEqual(cleaned_value.url, 'http://www.example.com/foo') cleaned_value = nonrequired_block.clean(EmbedValue('http://www.example.com/foo')) - self.assertTrue(isinstance(cleaned_value, EmbedValue)) + self.assertIsInstance(cleaned_value, EmbedValue) self.assertEqual(cleaned_value.url, 'http://www.example.com/foo') # None should only be accepted for nonrequired blocks