From 4d48ddd8f93800a80330ec1dee7b7d4afe6ea95a Mon Sep 17 00:00:00 2001 From: Josh Schneier Date: Sun, 15 Jul 2018 17:47:17 -0400 Subject: Fixed #28917 -- Prevented Paginator's unordered warning on EmptyQuerySet. Thanks carltongibson for the idea and weijunji for the initial patch. --- django/db/models/query.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'django') diff --git a/django/db/models/query.py b/django/db/models/query.py index 5ae451879c..c0d2dee3c1 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -1100,8 +1100,10 @@ class QuerySet: def ordered(self): """ Return True if the QuerySet is ordered -- i.e. has an order_by() - clause or a default ordering on the model. + clause or a default ordering on the model (or is empty). """ + if isinstance(self, EmptyQuerySet): + return True if self.query.extra_order_by or self.query.order_by: return True elif self.query.default_ordering and self.query.get_meta().ordering: -- cgit v1.3