summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-10-14 02:11:47 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-10-14 02:11:47 +0000
commitdfe7e4e9252ce51615f8c668e6664423ad0accb4 (patch)
tree203417dea9290040bf7e97e4a835821a315a553c
parent7ebf3068c16d29c0288a317dac45166a8bc4c23c (diff)
queryset-refactor: Fixed a bug in QuerySet.get(). Also removed unneeded code form EmptyQuerySet.
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6484 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/models/query.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 967234a6d7..7e53397161 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -146,7 +146,6 @@ class _QuerySet(object):
keyword arguments.
"""
clone = self.filter(*args, **kwargs)
- clone.query.clear_ordering()
obj_list = list(clone)
if len(obj_list) < 1:
raise self.model.DoesNotExist("%s matching query does not exist."
@@ -501,6 +500,7 @@ class DateQuerySet(QuerySet):
c._order = self._order
return c
+# XXX; Everything below here is done.
class EmptyQuerySet(QuerySet):
def __init__(self, model=None):
super(EmptyQuerySet, self).__init__(model)
@@ -517,9 +517,6 @@ class EmptyQuerySet(QuerySet):
c._result_cache = []
return c
- def _get_sql_clause(self):
- raise EmptyResultSet
-
# QOperator, QAnd and QOr are temporarily retained for backwards compatibility.
# All the old functionality is now part of the 'Q' class.
class QOperator(Q):