From c61c6a85253e76fe5ef8d7da48af94d248e3786f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastien=20G=C3=A9rard?= Date: Sat, 31 Aug 2019 22:51:13 +0300 Subject: [PATCH] fix == None assertions --- tests/document/test_class_methods.py | 2 +- tests/document/test_inheritance.py | 4 +-- tests/document/test_instance.py | 32 +++++++++--------- tests/document/test_validation.py | 2 +- tests/fields/test_fields.py | 10 +++--- tests/queryset/test_field_list.py | 50 ++++++++++++++-------------- tests/queryset/test_modify.py | 6 ++-- tests/queryset/test_queryset.py | 28 ++++++++-------- tests/queryset/test_visitor.py | 4 +-- tests/test_datastructures.py | 2 +- 10 files changed, 70 insertions(+), 70 deletions(-) diff --git a/tests/document/test_class_methods.py b/tests/document/test_class_methods.py index 98909d2f..be883b2a 100644 --- a/tests/document/test_class_methods.py +++ b/tests/document/test_class_methods.py @@ -72,7 +72,7 @@ class TestClassMethods(unittest.TestCase): class Job(Document): employee = ReferenceField(self.Person) - assert self.Person._meta.get("delete_rules") == None + assert self.Person._meta.get("delete_rules") is None self.Person.register_delete_rule(Job, "employee", NULLIFY) assert self.Person._meta["delete_rules"] == {(Job, "employee"): NULLIFY} diff --git a/tests/document/test_inheritance.py b/tests/document/test_inheritance.py index 3e515653..b6b6088a 100644 --- a/tests/document/test_inheritance.py +++ b/tests/document/test_inheritance.py @@ -559,8 +559,8 @@ class TestInheritance(MongoDBTestCase): assert "collection" not in Animal._meta assert "collection" not in Mammal._meta - assert Animal._get_collection_name() == None - assert Mammal._get_collection_name() == None + assert Animal._get_collection_name() is None + assert Mammal._get_collection_name() is None assert Fish._get_collection_name() == "fish" assert Guppy._get_collection_name() == "fish" diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py index c7bc113e..57815355 100644 --- a/tests/document/test_instance.py +++ b/tests/document/test_instance.py @@ -1391,7 +1391,7 @@ class TestInstance(MongoDBTestCase): person.reload() assert person.name == "User" - assert person.age == None + assert person.age is None person = self.Person.objects.get() person.name = None @@ -1399,8 +1399,8 @@ class TestInstance(MongoDBTestCase): person.save() person.reload() - assert person.name == None - assert person.age == None + assert person.name is None + assert person.age is None def test_update_rename_operator(self): """Test the $rename operator.""" @@ -2018,7 +2018,7 @@ class TestInstance(MongoDBTestCase): promoted_employee.save() promoted_employee.reload() - assert promoted_employee.details == None + assert promoted_employee.details is None def test_object_mixins(self): class NameMixin(object): @@ -2154,7 +2154,7 @@ class TestInstance(MongoDBTestCase): reviewer.delete() # No effect on the BlogPost assert BlogPost.objects.count() == 1 - assert BlogPost.objects.get().reviewer == None + assert BlogPost.objects.get().reviewer is None # Delete the Person, which should lead to deletion of the BlogPost, too author.delete() @@ -2200,7 +2200,7 @@ class TestInstance(MongoDBTestCase): reviewer.delete() assert Book.objects.count() == 1 - assert Book.objects.get().reviewer == None + assert Book.objects.get().reviewer is None user.delete() assert Book.objects.count() == 0 @@ -2267,7 +2267,7 @@ class TestInstance(MongoDBTestCase): reviewer.delete() assert BlogPost.objects.count() == 1 - assert BlogPost.objects.get().reviewer == None + assert BlogPost.objects.get().reviewer is None # Delete the Writer should lead to deletion of the BlogPost author.delete() @@ -2378,7 +2378,7 @@ class TestInstance(MongoDBTestCase): f.delete() assert Bar.objects.count() == 1 # No effect on the BlogPost - assert Bar.objects.get().foo == None + assert Bar.objects.get().foo is None def test_invalid_reverse_delete_rule_raise_errors(self): with pytest.raises(InvalidDocumentError): @@ -3464,7 +3464,7 @@ class TestInstance(MongoDBTestCase): p = Person.from_json('{"name": "name"}', created=False) assert p._created == False - assert p.id == None + assert p.id is None # Make sure the document is subsequently persisted correctly. p.save() @@ -3540,13 +3540,13 @@ class TestInstance(MongoDBTestCase): u_from_db = User.objects.get(name="user") u_from_db.height = None u_from_db.save() - assert u_from_db.height == None + assert u_from_db.height is None # 864 - assert u_from_db.str_fld == None - assert u_from_db.int_fld == None - assert u_from_db.flt_fld == None - assert u_from_db.dt_fld == None - assert u_from_db.cdt_fld == None + assert u_from_db.str_fld is None + assert u_from_db.int_fld is None + assert u_from_db.flt_fld is None + assert u_from_db.dt_fld is None + assert u_from_db.cdt_fld is None # 735 User.objects.delete() @@ -3554,7 +3554,7 @@ class TestInstance(MongoDBTestCase): u.save() User.objects(name="user").update_one(set__height=None, upsert=True) u_from_db = User.objects.get(name="user") - assert u_from_db.height == None + assert u_from_db.height is None def test_not_saved_eq(self): """Ensure we can compare documents not saved. diff --git a/tests/document/test_validation.py b/tests/document/test_validation.py index 80601994..dfae5bae 100644 --- a/tests/document/test_validation.py +++ b/tests/document/test_validation.py @@ -110,7 +110,7 @@ class TestValidatorError(MongoDBTestCase): comment.date = datetime.now() comment.validate() - assert comment._instance == None + assert comment._instance is None def test_embedded_db_field_validate(self): class SubDoc(EmbeddedDocument): diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py index 0ce65087..21cc78be 100644 --- a/tests/fields/test_fields.py +++ b/tests/fields/test_fields.py @@ -180,7 +180,7 @@ class TestField(MongoDBTestCase): assert person.validate() is None - assert person.name == None + assert person.name is None assert person.age == 30 assert person.userid == "test" assert isinstance(person.created, datetime.datetime) @@ -250,7 +250,7 @@ class TestField(MongoDBTestCase): assert person.validate() is None - assert person.name == None + assert person.name is None assert person.age == 30 assert person.userid == "test" assert isinstance(person.created, datetime.datetime) @@ -363,7 +363,7 @@ class TestField(MongoDBTestCase): name = StringField() person = Person(name="Test User") - assert person.id == None + assert person.id is None person.id = 47 with pytest.raises(ValidationError): @@ -1970,7 +1970,7 @@ class TestField(MongoDBTestCase): shirt2 = Shirt() # Make sure get__display returns the default value (or None) - assert shirt1.get_size_display() == None + assert shirt1.get_size_display() is None assert shirt1.get_style_display() == "Wide" shirt1.size = "XXL" @@ -2024,7 +2024,7 @@ class TestField(MongoDBTestCase): shirt = Shirt() - assert shirt.get_size_display() == None + assert shirt.get_size_display() is None assert shirt.get_style_display() == "Small" shirt.size = "XXL" diff --git a/tests/queryset/test_field_list.py b/tests/queryset/test_field_list.py index d33c4c86..a2bf6f1f 100644 --- a/tests/queryset/test_field_list.py +++ b/tests/queryset/test_field_list.py @@ -154,10 +154,10 @@ class TestOnlyExcludeAll(unittest.TestCase): obj = self.Person.objects.only("name").get() assert obj.name == person.name - assert obj.age == None + assert obj.age is None obj = self.Person.objects.only("age").get() - assert obj.name == None + assert obj.name is None assert obj.age == person.age obj = self.Person.objects.only("name", "age").get() @@ -166,7 +166,7 @@ class TestOnlyExcludeAll(unittest.TestCase): obj = self.Person.objects.only(*("id", "name")).get() assert obj.name == person.name - assert obj.age == None + assert obj.age is None # Check polymorphism still works class Employee(self.Person): @@ -181,7 +181,7 @@ class TestOnlyExcludeAll(unittest.TestCase): # Check field names are looked up properly obj = Employee.objects(id=employee.id).only("salary").get() assert obj.salary == employee.salary - assert obj.name == None + assert obj.name is None def test_only_with_subfields(self): class User(EmbeddedDocument): @@ -215,8 +215,8 @@ class TestOnlyExcludeAll(unittest.TestCase): post.save() obj = BlogPost.objects.only("author.name").get() - assert obj.content == None - assert obj.author.email == None + assert obj.content is None + assert obj.author.email is None assert obj.author.name == "Test User" assert obj.comments == [] @@ -225,15 +225,15 @@ class TestOnlyExcludeAll(unittest.TestCase): obj = BlogPost.objects.only("content", "comments.title").get() assert obj.content == "Had a good coffee today..." - assert obj.author == None + assert obj.author is None assert obj.comments[0].title == "I aggree" assert obj.comments[1].title == "Coffee" - assert obj.comments[0].text == None - assert obj.comments[1].text == None + assert obj.comments[0].text is None + assert obj.comments[1].text is None obj = BlogPost.objects.only("comments").get() - assert obj.content == None - assert obj.author == None + assert obj.content is None + assert obj.author is None assert obj.comments[0].title == "I aggree" assert obj.comments[1].title == "Coffee" assert obj.comments[0].text == "Great post!" @@ -266,10 +266,10 @@ class TestOnlyExcludeAll(unittest.TestCase): post.save() obj = BlogPost.objects.exclude("author", "comments.text").get() - assert obj.author == None + assert obj.author is None assert obj.content == "Had a good coffee today..." assert obj.comments[0].title == "I aggree" - assert obj.comments[0].text == None + assert obj.comments[0].text is None BlogPost.drop_collection() @@ -304,15 +304,15 @@ class TestOnlyExcludeAll(unittest.TestCase): assert obj.sender == "me" assert obj.to == "you" assert obj.subject == "From Russia with Love" - assert obj.body == None - assert obj.content_type == None + assert obj.body is None + assert obj.content_type is None obj = Email.objects.only("sender", "to").exclude("body", "sender").get() - assert obj.sender == None + assert obj.sender is None assert obj.to == "you" - assert obj.subject == None - assert obj.body == None - assert obj.content_type == None + assert obj.subject is None + assert obj.body is None + assert obj.content_type is None obj = ( Email.objects.exclude("attachments.content") @@ -321,12 +321,12 @@ class TestOnlyExcludeAll(unittest.TestCase): .get() ) assert obj.attachments[0].name == "file1.doc" - assert obj.attachments[0].content == None - assert obj.sender == None + assert obj.attachments[0].content is None + assert obj.sender is None assert obj.to == "you" - assert obj.subject == None - assert obj.body == None - assert obj.content_type == None + assert obj.subject is None + assert obj.body is None + assert obj.content_type is None Email.drop_collection() @@ -456,7 +456,7 @@ class TestOnlyExcludeAll(unittest.TestCase): User(username="mongodb", password="secret").save() user = Base.objects().exclude("password", "wibble").first() - assert user.password == None + assert user.password is None with pytest.raises(LookUpError): Base.objects.exclude("made_up") diff --git a/tests/queryset/test_modify.py b/tests/queryset/test_modify.py index 293a463e..556e6d9e 100644 --- a/tests/queryset/test_modify.py +++ b/tests/queryset/test_modify.py @@ -35,13 +35,13 @@ class TestFindAndModify(unittest.TestCase): def test_modify_not_existing(self): Doc(id=0, value=0).save() - assert Doc.objects(id=1).modify(set__value=-1) == None + assert Doc.objects(id=1).modify(set__value=-1) is None self.assertDbEqual([{"_id": 0, "value": 0}]) def test_modify_with_upsert(self): Doc(id=0, value=0).save() old_doc = Doc.objects(id=1).modify(set__value=1, upsert=True) - assert old_doc == None + assert old_doc is None self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": 1}]) def test_modify_with_upsert_existing(self): @@ -68,7 +68,7 @@ class TestFindAndModify(unittest.TestCase): def test_find_and_modify_with_remove_not_existing(self): Doc(id=0, value=0).save() - assert Doc.objects(id=1).modify(remove=True) == None + assert Doc.objects(id=1).modify(remove=True) is None self.assertDbEqual([{"_id": 0, "value": 0}]) def test_modify_with_order_by(self): diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py index 31abb42f..f3606609 100644 --- a/tests/queryset/test_queryset.py +++ b/tests/queryset/test_queryset.py @@ -142,7 +142,7 @@ class TestQueryset(unittest.TestCase): person = self.Person.objects().limit(1).only("name").first() assert person == user_a assert person.name == "User A" - assert person.age == None + assert person.age is None def test_skip(self): """Ensure that QuerySet.skip works as expected.""" @@ -166,7 +166,7 @@ class TestQueryset(unittest.TestCase): person = self.Person.objects().skip(1).only("name").first() assert person == user_b assert person.name == "User B" - assert person.age == None + assert person.age is None def test___getitem___invalid_index(self): """Ensure slicing a queryset works as expected.""" @@ -444,7 +444,7 @@ class TestQueryset(unittest.TestCase): assert result == 2 result = self.Person.objects.update(set__name="Ross", write_concern={"w": 0}) - assert result == None + assert result is None result = self.Person.objects.update_one( set__name="Test User", write_concern={"w": 1} @@ -453,7 +453,7 @@ class TestQueryset(unittest.TestCase): result = self.Person.objects.update_one( set__name="Test User", write_concern={"w": 0} ) - assert result == None + assert result is None def test_update_update_has_a_value(self): """Test to ensure that update is passed a value to update to""" @@ -1148,7 +1148,7 @@ class TestQueryset(unittest.TestCase): obj = self.Person.objects(name__contains="van").first() assert obj == person obj = self.Person.objects(name__contains="Van").first() - assert obj == None + assert obj is None # Test icontains obj = self.Person.objects(name__icontains="Van").first() @@ -1158,7 +1158,7 @@ class TestQueryset(unittest.TestCase): obj = self.Person.objects(name__startswith="Guido").first() assert obj == person obj = self.Person.objects(name__startswith="guido").first() - assert obj == None + assert obj is None # Test istartswith obj = self.Person.objects(name__istartswith="guido").first() @@ -1168,7 +1168,7 @@ class TestQueryset(unittest.TestCase): obj = self.Person.objects(name__endswith="Rossum").first() assert obj == person obj = self.Person.objects(name__endswith="rossuM").first() - assert obj == None + assert obj is None # Test iendswith obj = self.Person.objects(name__iendswith="rossuM").first() @@ -1178,15 +1178,15 @@ class TestQueryset(unittest.TestCase): obj = self.Person.objects(name__exact="Guido van Rossum").first() assert obj == person obj = self.Person.objects(name__exact="Guido van rossum").first() - assert obj == None + assert obj is None obj = self.Person.objects(name__exact="Guido van Rossu").first() - assert obj == None + assert obj is None # Test iexact obj = self.Person.objects(name__iexact="gUIDO VAN rOSSUM").first() assert obj == person obj = self.Person.objects(name__iexact="gUIDO VAN rOSSU").first() - assert obj == None + assert obj is None # Test unsafe expressions person = self.Person(name="Guido van Rossum [.'Geek']") @@ -1205,7 +1205,7 @@ class TestQueryset(unittest.TestCase): assert obj == alice obj = self.Person.objects(name__not__iexact="alice").first() - assert obj == None + assert obj is None def test_filter_chaining(self): """Ensure filters can be chained together. @@ -1430,7 +1430,7 @@ class TestQueryset(unittest.TestCase): BlogPost.objects.create(content="Anonymous post...") result = BlogPost.objects.get(author=None) - assert result.author == None + assert result.author is None def test_find_dict_item(self): """Ensure that DictField items may be found. @@ -2050,7 +2050,7 @@ class TestQueryset(unittest.TestCase): assert post.title != None BlogPost.objects.update_one(unset__title=1) post.reload() - assert post.title == None + assert post.title is None pymongo_doc = BlogPost.objects.as_pymongo().first() assert "title" not in pymongo_doc @@ -4041,7 +4041,7 @@ class TestQueryset(unittest.TestCase): assert post.comment == comment Post.objects.update(unset__comment=1) post.reload() - assert post.comment == None + assert post.comment is None Comment.drop_collection() Post.drop_collection() diff --git a/tests/queryset/test_visitor.py b/tests/queryset/test_visitor.py index a41f9278..9706d012 100644 --- a/tests/queryset/test_visitor.py +++ b/tests/queryset/test_visitor.py @@ -294,7 +294,7 @@ class TestQ(unittest.TestCase): obj = self.Person.objects(Q(name=re.compile("^Gui"))).first() assert obj == person obj = self.Person.objects(Q(name=re.compile("^gui"))).first() - assert obj == None + assert obj is None obj = self.Person.objects(Q(name=re.compile("^gui", re.I))).first() assert obj == person @@ -303,7 +303,7 @@ class TestQ(unittest.TestCase): assert obj == person obj = self.Person.objects(Q(name__not=re.compile("^Gui"))).first() - assert obj == None + assert obj is None def test_q_repr(self): assert repr(Q()) == "Q(**{})" diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py index 3a6029c1..24cda40d 100644 --- a/tests/test_datastructures.py +++ b/tests/test_datastructures.py @@ -122,7 +122,7 @@ class TestBaseDict(unittest.TestCase): def test_get_default(self): base_dict = self._get_basedict({}) sentinel = object() - assert base_dict.get("new") == None + assert base_dict.get("new") is None assert base_dict.get("new", sentinel) is sentinel def test___setitem___calls_mark_as_changed(self):