Commit b5f8c81c authored by Anderson Resende's avatar Anderson Resende Committed by Tim Graham
Browse files

Fixed #26026 -- Fixed isinstance crash comparing EmptyQuerySet to non-QuerySet.

parent b6433866

django/db/models/query.py

+1 −1
Original line number Diff line number Diff line
@@ -1171,7 +1171,7 @@ class QuerySet(object): 


class InstanceCheckMeta(type):

    def __instancecheck__(self, instance):

        return instance.query.is_empty()

        return isinstance(instance, QuerySet) and instance.query.is_empty()





class EmptyQuerySet(six.with_metaclass(InstanceCheckMeta)):

tests/basic/tests.py

+1 −0
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ class ModelTest(TestCase): 
        with self.assertRaises(TypeError):

            EmptyQuerySet()

        self.assertIsInstance(Article.objects.none(), EmptyQuerySet)

        self.assertFalse(isinstance('', EmptyQuerySet))



    def test_emptyqs_values(self):

        # test for #15959