From cec11a3336c730e6dc2f1966fee749cc830e97c0 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 10 Oct 2013 09:35:56 -0400 Subject: [PATCH] Used "is" for comparisons with None. --- django/core/mail/message.py | 3 ++- django/forms/widgets.py | 2 +- django/middleware/cache.py | 2 +- django/template/defaulttags.py | 2 +- django/test/_doctest.py | 2 +- tests/basic/tests.py | 4 ++-- tests/comment_tests/tests/test_comment_view.py | 14 +++++++------- tests/signals_regress/tests.py | 4 ++-- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/django/core/mail/message.py b/django/core/mail/message.py index 2f24688d42..85699aacec 100644 --- a/django/core/mail/message.py +++ b/django/core/mail/message.py @@ -292,7 +292,8 @@ class EmailMessage(object): into the resulting message attachments. """ if isinstance(filename, MIMEBase): - assert content == mimetype == None + assert content is None + assert mimetype is None self.attachments.append(filename) else: assert content is not None diff --git a/django/forms/widgets.py b/django/forms/widgets.py index f8320117f7..678b963e7e 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -508,7 +508,7 @@ class Select(Widget): return mark_safe('\n'.join(output)) def render_option(self, selected_choices, option_value, option_label): - if option_value == None: + if option_value is None: option_value = '' option_value = force_text(option_value) if option_value in selected_choices: diff --git a/django/middleware/cache.py b/django/middleware/cache.py index 55b61358ea..dbd5b80fb2 100644 --- a/django/middleware/cache.py +++ b/django/middleware/cache.py @@ -96,7 +96,7 @@ class UpdateCacheMiddleware(object): # Control" header before reverting to using the default cache_timeout # length. timeout = get_max_age(response) - if timeout == None: + if timeout is None: timeout = self.cache_timeout elif timeout == 0: # max-age was set to 0, don't bother caching. diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index 798323c2cf..bc9cfc1c8f 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -315,7 +315,7 @@ class RegroupNode(Node): def render(self, context): obj_list = self.target.resolve(context, True) - if obj_list == None: + if obj_list is None: # target variable wasn't found in context; fail silently. context[self.var_name] = [] return '' diff --git a/django/test/_doctest.py b/django/test/_doctest.py index 3f6962dc17..4f4837f3c6 100644 --- a/django/test/_doctest.py +++ b/django/test/_doctest.py @@ -1345,7 +1345,7 @@ class DocTestRunner: # exception message will be in group(2) m = re.match(r'(.*)\.(\w+:.+\s)', exc_msg) # make sure there's a match - if m != None: + if m is not None: f_name = m.group(1) # check to see if m.group(1) contains the module name if f_name == exception[0].__module__: diff --git a/tests/basic/tests.py b/tests/basic/tests.py index 0d766dde2b..5c1ed0726a 100644 --- a/tests/basic/tests.py +++ b/tests/basic/tests.py @@ -33,7 +33,7 @@ class ModelTest(TestCase): a.save() # Now it has an ID. - self.assertTrue(a.id != None) + self.assertTrue(a.id is not None) # Models have a pk property that is an alias for the primary key # attribute (by default, the 'id' attribute). @@ -585,7 +585,7 @@ class ModelTest(TestCase): f3 = Field() self.assertTrue(f2 < f1) self.assertTrue(f3 > f1) - self.assertFalse(f1 == None) + self.assertFalse(f1 is None) self.assertFalse(f2 in (None, 1, '')) def test_extra_method_select_argument_with_dashes_and_values(self): diff --git a/tests/comment_tests/tests/test_comment_view.py b/tests/comment_tests/tests/test_comment_view.py index 19d7c1d16b..731776a1e2 100644 --- a/tests/comment_tests/tests/test_comment_view.py +++ b/tests/comment_tests/tests/test_comment_view.py @@ -243,21 +243,21 @@ class CommentViewTests(CommentTestCase): response = self.client.post("/post/", data) location = response["Location"] match = post_redirect_re.match(location) - self.assertTrue(match != None, "Unexpected redirect location: %s" % location) + self.assertTrue(match is not None, "Unexpected redirect location: %s" % location) data["next"] = "/somewhere/else/" data["comment"] = "This is another comment" response = self.client.post("/post/", data) location = response["Location"] match = re.search(r"^http://testserver/somewhere/else/\?c=\d+$", location) - self.assertTrue(match != None, "Unexpected redirect location: %s" % location) + self.assertTrue(match is not None, "Unexpected redirect location: %s" % location) data["next"] = "http://badserver/somewhere/else/" data["comment"] = "This is another comment with an unsafe next url" response = self.client.post("/post/", data) location = response["Location"] match = post_redirect_re.match(location) - self.assertTrue(match != None, "Unsafe redirection to: %s" % location) + self.assertTrue(match is not None, "Unsafe redirection to: %s" % location) def testCommentDoneView(self): a = Article.objects.get(pk=1) @@ -265,7 +265,7 @@ class CommentViewTests(CommentTestCase): response = self.client.post("/post/", data) location = response["Location"] match = post_redirect_re.match(location) - self.assertTrue(match != None, "Unexpected redirect location: %s" % location) + self.assertTrue(match is not None, "Unexpected redirect location: %s" % location) pk = int(match.group('pk')) response = self.client.get(location) self.assertTemplateUsed(response, "comments/posted.html") @@ -282,7 +282,7 @@ class CommentViewTests(CommentTestCase): response = self.client.post("/post/", data) location = response["Location"] match = re.search(r"^http://testserver/somewhere/else/\?foo=bar&c=\d+$", location) - self.assertTrue(match != None, "Unexpected redirect location: %s" % location) + self.assertTrue(match is not None, "Unexpected redirect location: %s" % location) def testCommentPostRedirectWithInvalidIntegerPK(self): """ @@ -311,7 +311,7 @@ class CommentViewTests(CommentTestCase): response = self.client.post("/post/", data) location = response["Location"] match = re.search(r"^http://testserver/somewhere/else/\?foo=bar&c=\d+#baz$", location) - self.assertTrue(match != None, "Unexpected redirect location: %s" % location) + self.assertTrue(match is not None, "Unexpected redirect location: %s" % location) # Without a query string a = Article.objects.get(pk=1) @@ -321,4 +321,4 @@ class CommentViewTests(CommentTestCase): response = self.client.post("/post/", data) location = response["Location"] match = re.search(r"^http://testserver/somewhere/else/\?c=\d+#baz$", location) - self.assertTrue(match != None, "Unexpected redirect location: %s" % location) + self.assertTrue(match is not None, "Unexpected redirect location: %s" % location) diff --git a/tests/signals_regress/tests.py b/tests/signals_regress/tests.py index 2c9858efda..328e699b9d 100644 --- a/tests/signals_regress/tests.py +++ b/tests/signals_regress/tests.py @@ -34,11 +34,11 @@ class SignalsRegressTests(TestCase): def pre_delete_test(self, signal, sender, instance, **kwargs): self.signal_output.append('pre_save signal, %s' % instance) - self.signal_output.append('instance.id is not None: %s' % (instance.id != None)) + self.signal_output.append('instance.id is not None: %s' % (instance.id is not None)) def post_delete_test(self, signal, sender, instance, **kwargs): self.signal_output.append('post_delete signal, %s' % instance) - self.signal_output.append('instance.id is not None: %s' % (instance.id != None)) + self.signal_output.append('instance.id is not None: %s' % (instance.id is not None)) def setUp(self): self.signal_output = []