summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/db/models/query.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 02a46a81c3..b1921a8e4b 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -1,17 +1,16 @@
import warnings
+try:
+ set
+except NameError:
+ from sets import Set as set # Python 2.3 fallback
-from django.conf import settings
from django.db import connection, transaction, IntegrityError
-from django.db.models.fields import DateField, FieldDoesNotExist
+from django.db.models.fields import DateField
from django.db.models.query_utils import Q, select_related_descend
from django.db.models import signals, sql
from django.dispatch import dispatcher
from django.utils.datastructures import SortedDict
-try:
- set
-except NameError:
- from sets import Set as set # Python 2.3 fallback
# Used to control how many objects are worked with at once in some cases (e.g.
# when deleting objects).