[1.10.x] Fixed #26747 -- Used more specific assertions in the Django test suite.

Backport of 4f336f66523001b009ab038b10848508fd208b3b from master

5 files changed, 18 insertions, 18 deletions

diff --git a/tests/utils_tests/test_datastructures.py b/tests/utils_tests/test_datastructures.py
index 2d30e18915..0f520ff9e7 100644
--- a/tests/utils_tests/test_datastructures.py
+++ b/tests/utils_tests/test_datastructures.py
@@ -52,7 +52,7 @@ class MultiValueDictTests(SimpleTestCase):
         with self.assertRaisesMessage(MultiValueDictKeyError, 'lastname'):
             d.__getitem__('lastname')
 
-        self.assertEqual(d.get('lastname'), None)
+        self.assertIsNone(d.get('lastname'))
         self.assertEqual(d.get('lastname', 'nonexistent'), 'nonexistent')
         self.assertEqual(d.getlist('lastname'), [])
         self.assertEqual(d.getlist('doesnotexist', ['Adrian', 'Simon']),
diff --git a/tests/utils_tests/test_dateparse.py b/tests/utils_tests/test_dateparse.py
index bf740a9cc5..ee4f907b55 100644
--- a/tests/utils_tests/test_dateparse.py
+++ b/tests/utils_tests/test_dateparse.py
@@ -16,7 +16,7 @@ class DateParseTests(unittest.TestCase):
         self.assertEqual(parse_date('2012-04-23'), date(2012, 4, 23))
         self.assertEqual(parse_date('2012-4-9'), date(2012, 4, 9))
         # Invalid inputs
-        self.assertEqual(parse_date('20120423'), None)
+        self.assertIsNone(parse_date('20120423'))
         with self.assertRaises(ValueError):
             parse_date('2012-04-56')
 
@@ -27,7 +27,7 @@ class DateParseTests(unittest.TestCase):
         self.assertEqual(parse_time('10:20:30.400'), time(10, 20, 30, 400000))
         self.assertEqual(parse_time('4:8:16'), time(4, 8, 16))
         # Invalid inputs
-        self.assertEqual(parse_time('091500'), None)
+        self.assertIsNone(parse_time('091500'))
         with self.assertRaises(ValueError):
             parse_time('09:15:90')
 
@@ -62,7 +62,7 @@ class DateParseTests(unittest.TestCase):
             datetime(2012, 4, 23, 10, 20, 30, 400000, get_fixed_timezone(-120))
         )
         # Invalid inputs
-        self.assertEqual(parse_datetime('20120423091500'), None)
+        self.assertIsNone(parse_datetime('20120423091500'))
         with self.assertRaises(ValueError):
             parse_datetime('2012-04-56T09:15:90')
 
@@ -110,9 +110,9 @@ class DurationParseTests(unittest.TestCase):
         self.assertEqual(parse_duration('-4 15:30'), timedelta(days=-4, minutes=15, seconds=30))
 
     def test_iso_8601(self):
-        self.assertEqual(parse_duration('P4Y'), None)
-        self.assertEqual(parse_duration('P4M'), None)
-        self.assertEqual(parse_duration('P4W'), None)
+        self.assertIsNone(parse_duration('P4Y'))
+        self.assertIsNone(parse_duration('P4M'))
+        self.assertIsNone(parse_duration('P4W'))
         self.assertEqual(parse_duration('P4D'), timedelta(days=4))
         self.assertEqual(parse_duration('P0.5D'), timedelta(hours=12))
         self.assertEqual(parse_duration('PT5H'), timedelta(hours=5))
diff --git a/tests/utils_tests/test_feedgenerator.py b/tests/utils_tests/test_feedgenerator.py
index 21c88f93ce..74ab8f1d00 100644
--- a/tests/utils_tests/test_feedgenerator.py
+++ b/tests/utils_tests/test_feedgenerator.py
@@ -108,7 +108,7 @@ class FeedgeneratorTest(unittest.TestCase):
 
     def test_feed_without_feed_url_gets_rendered_without_atom_link(self):
         feed = feedgenerator.Rss201rev2Feed('title', '/link/', 'descr')
-        self.assertEqual(feed.feed['feed_url'], None)
+        self.assertIsNone(feed.feed['feed_url'])
         feed_content = feed.writeString('utf-8')
         self.assertNotIn('<atom:link', feed_content)
         self.assertNotIn('href="/feed/"', feed_content)
diff --git a/tests/utils_tests/test_inspect.py b/tests/utils_tests/test_inspect.py
index 88a9fb0d74..e9a2cd086f 100644
--- a/tests/utils_tests/test_inspect.py
+++ b/tests/utils_tests/test_inspect.py
@@ -29,7 +29,7 @@ class TestInspectMethods(unittest.TestCase):
         self.assertEqual(inspect.get_func_full_args(Person.all_kinds), arguments)
 
     def test_func_accepts_var_args_has_var_args(self):
-        self.assertEqual(inspect.func_accepts_var_args(Person.just_args), True)
+        self.assertIs(inspect.func_accepts_var_args(Person.just_args), True)
 
     def test_func_accepts_var_args_no_var_args(self):
-        self.assertEqual(inspect.func_accepts_var_args(Person.one_argument), False)
+        self.assertIs(inspect.func_accepts_var_args(Person.one_argument), False)
diff --git a/tests/utils_tests/test_termcolors.py b/tests/utils_tests/test_termcolors.py
index 08e4ae5f5a..ca5e8fc1fa 100644
--- a/tests/utils_tests/test_termcolors.py
+++ b/tests/utils_tests/test_termcolors.py
@@ -14,7 +14,7 @@ class TermColorTests(unittest.TestCase):
     def test_simple_palette(self):
         self.assertEqual(parse_color_setting('light'), PALETTES[LIGHT_PALETTE])
         self.assertEqual(parse_color_setting('dark'), PALETTES[DARK_PALETTE])
-        self.assertEqual(parse_color_setting('nocolor'), None)
+        self.assertIsNone(parse_color_setting('nocolor'))
 
     def test_fg(self):
         self.assertEqual(
@@ -76,9 +76,9 @@ class TermColorTests(unittest.TestCase):
         )
 
     def test_empty_definition(self):
-        self.assertEqual(parse_color_setting(';'), None)
+        self.assertIsNone(parse_color_setting(';'))
         self.assertEqual(parse_color_setting('light;'), PALETTES[LIGHT_PALETTE])
-        self.assertEqual(parse_color_setting(';;;'), None)
+        self.assertIsNone(parse_color_setting(';;;'))
 
     def test_empty_options(self):
         self.assertEqual(
@@ -95,23 +95,23 @@ class TermColorTests(unittest.TestCase):
         )
 
     def test_bad_palette(self):
-        self.assertEqual(parse_color_setting('unknown'), None)
+        self.assertIsNone(parse_color_setting('unknown'))
 
     def test_bad_role(self):
-        self.assertEqual(parse_color_setting('unknown='), None)
-        self.assertEqual(parse_color_setting('unknown=green'), None)
+        self.assertIsNone(parse_color_setting('unknown='))
+        self.assertIsNone(parse_color_setting('unknown=green'))
         self.assertEqual(
             parse_color_setting('unknown=green;sql_field=blue'),
             dict(PALETTES[NOCOLOR_PALETTE], SQL_FIELD={'fg': 'blue'})
         )
 
     def test_bad_color(self):
-        self.assertEqual(parse_color_setting('error='), None)
+        self.assertIsNone(parse_color_setting('error='))
         self.assertEqual(
             parse_color_setting('error=;sql_field=blue'),
             dict(PALETTES[NOCOLOR_PALETTE], SQL_FIELD={'fg': 'blue'})
         )
-        self.assertEqual(parse_color_setting('error=unknown'), None)
+        self.assertIsNone(parse_color_setting('error=unknown'))
         self.assertEqual(
             parse_color_setting('error=unknown;sql_field=blue'),
             dict(PALETTES[NOCOLOR_PALETTE], SQL_FIELD={'fg': 'blue'})