innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Used "is" for comparisons with None.

This commit is contained in:
Tim Graham 2013-10-10 09:35:56 -04:00
parent ff9e8eccf8
commit cec11a3336
8 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/core/mail/message.py
View File

@ -292,7 +292,8 @@ class EmailMessage(object):
into the resulting message attachments. into the resulting message attachments.
""" """
if isinstance(filename, MIMEBase): if isinstance(filename, MIMEBase):
assert content == mimetype == None assert content is None
assert mimetype is None
self.attachments.append(filename) self.attachments.append(filename)
else: else:
assert content is not None assert content is not None

2
django/forms/widgets.py
View File

@ -508,7 +508,7 @@ class Select(Widget):
return mark_safe('\n'.join(output)) return mark_safe('\n'.join(output))
def render_option(self, selected_choices, option_value, option_label): def render_option(self, selected_choices, option_value, option_label):
if option_value == None: if option_value is None:
option_value = '' option_value = ''
option_value = force_text(option_value) option_value = force_text(option_value)
if option_value in selected_choices: if option_value in selected_choices:

2
django/middleware/cache.py
View File

@ -96,7 +96,7 @@ class UpdateCacheMiddleware(object):
# Control" header before reverting to using the default cache_timeout # Control" header before reverting to using the default cache_timeout
# length. # length.
timeout = get_max_age(response) timeout = get_max_age(response)
if timeout == None: if timeout is None:
timeout = self.cache_timeout timeout = self.cache_timeout
elif timeout == 0: elif timeout == 0:
# max-age was set to 0, don't bother caching. # max-age was set to 0, don't bother caching.

2
django/template/defaulttags.py
View File

@ -315,7 +315,7 @@ class RegroupNode(Node):
def render(self, context): def render(self, context):
obj_list = self.target.resolve(context, True) 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. # target variable wasn't found in context; fail silently.
context[self.var_name] = [] context[self.var_name] = []
return '' return ''

2
django/test/_doctest.py
View File

@ -1345,7 +1345,7 @@ class DocTestRunner:
# exception message will be in group(2) # exception message will be in group(2)
m = re.match(r'(.*)\.(\w+:.+\s)', exc_msg) m = re.match(r'(.*)\.(\w+:.+\s)', exc_msg)
# make sure there's a match # make sure there's a match
if m != None: if m is not None:
f_name = m.group(1) f_name = m.group(1)
# check to see if m.group(1) contains the module name # check to see if m.group(1) contains the module name
if f_name == exception[0].__module__: if f_name == exception[0].__module__:

4
tests/basic/tests.py
View File

@ -33,7 +33,7 @@ class ModelTest(TestCase):
a.save() a.save()
# Now it has an ID. # 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 # Models have a pk property that is an alias for the primary key
# attribute (by default, the 'id' attribute). # attribute (by default, the 'id' attribute).
@ -585,7 +585,7 @@ class ModelTest(TestCase):
f3 = Field() f3 = Field()
self.assertTrue(f2 < f1) self.assertTrue(f2 < f1)
self.assertTrue(f3 > f1) self.assertTrue(f3 > f1)
self.assertFalse(f1 == None) self.assertFalse(f1 is None)
self.assertFalse(f2 in (None, 1, '')) self.assertFalse(f2 in (None, 1, ''))
def test_extra_method_select_argument_with_dashes_and_values(self): def test_extra_method_select_argument_with_dashes_and_values(self):

14
tests/comment_tests/tests/test_comment_view.py
View File

@ -243,21 +243,21 @@ class CommentViewTests(CommentTestCase):
response = self.client.post("/post/", data) response = self.client.post("/post/", data)
location = response["Location"] location = response["Location"]
match = post_redirect_re.match(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["next"] = "/somewhere/else/"
data["comment"] = "This is another comment" data["comment"] = "This is another comment"
response = self.client.post("/post/", data) response = self.client.post("/post/", data)
location = response["Location"] location = response["Location"]
match = re.search(r"^http://testserver/somewhere/else/\?c=\d+$", 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["next"] = "http://badserver/somewhere/else/"
data["comment"] = "This is another comment with an unsafe next url" data["comment"] = "This is another comment with an unsafe next url"
response = self.client.post("/post/", data) response = self.client.post("/post/", data)
location = response["Location"] location = response["Location"]
match = post_redirect_re.match(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): def testCommentDoneView(self):
a = Article.objects.get(pk=1) a = Article.objects.get(pk=1)
@ -265,7 +265,7 @@ class CommentViewTests(CommentTestCase):
response = self.client.post("/post/", data) response = self.client.post("/post/", data)
location = response["Location"] location = response["Location"]
match = post_redirect_re.match(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')) pk = int(match.group('pk'))
response = self.client.get(location) response = self.client.get(location)
self.assertTemplateUsed(response, "comments/posted.html") self.assertTemplateUsed(response, "comments/posted.html")
@ -282,7 +282,7 @@ class CommentViewTests(CommentTestCase):
response = self.client.post("/post/", data) response = self.client.post("/post/", data)
location = response["Location"] location = response["Location"]
match = re.search(r"^http://testserver/somewhere/else/\?foo=bar&c=\d+$", 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): def testCommentPostRedirectWithInvalidIntegerPK(self):
""" """
@ -311,7 +311,7 @@ class CommentViewTests(CommentTestCase):
response = self.client.post("/post/", data) response = self.client.post("/post/", data)
location = response["Location"] location = response["Location"]
match = re.search(r"^http://testserver/somewhere/else/\?foo=bar&c=\d+#baz$", 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 # Without a query string
a = Article.objects.get(pk=1) a = Article.objects.get(pk=1)
@ -321,4 +321,4 @@ class CommentViewTests(CommentTestCase):
response = self.client.post("/post/", data) response = self.client.post("/post/", data)
location = response["Location"] location = response["Location"]
match = re.search(r"^http://testserver/somewhere/else/\?c=\d+#baz$", 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)

4
tests/signals_regress/tests.py
View File

@ -34,11 +34,11 @@ class SignalsRegressTests(TestCase):
def pre_delete_test(self, signal, sender, instance, **kwargs): def pre_delete_test(self, signal, sender, instance, **kwargs):
self.signal_output.append('pre_save signal, %s' % instance) 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): def post_delete_test(self, signal, sender, instance, **kwargs):
self.signal_output.append('post_delete signal, %s' % instance) 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): def setUp(self):
self.signal_output = [] self.signal_output = []