From 64315b9eec185858a02006822dfe0389026be932 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Wed, 27 Feb 2008 02:47:14 +0000 Subject: [PATCH] queryset-refactor: Removed some more dead code. git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7165 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/query.py | 13 +------------ django/db/models/sql/query.py | 7 ++----- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/django/db/models/query.py b/django/db/models/query.py index 6e7d463e9e..195bbff91b 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -1,22 +1,11 @@ -import datetime -import operator -import re import warnings -from django.conf import settings from django.db import connection, transaction from django.db.models.fields import DateField, FieldDoesNotExist from django.db.models.query_utils import Q, QNot, EmptyResultSet -from django.db.models import signals, loading, sql +from django.db.models import signals, sql from django.dispatch import dispatcher from django.utils.datastructures import SortedDict -from django.utils.encoding import smart_unicode -from django.contrib.contenttypes import generic - -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). diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 4483062c73..205735f940 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -15,15 +15,12 @@ from django.dispatch import dispatcher from django.db.models import signals from django.db.models.sql.where import WhereNode, EverythingNode, AND, OR from django.db.models.sql.datastructures import Count -from django.db.models.fields import FieldDoesNotExist, Field, related +from django.db.models.fields import FieldDoesNotExist from django.core.exceptions import FieldError from datastructures import EmptyResultSet, Empty from constants import * -try: - reversed -except NameError: - from django.utils.itercompat import reversed # For python 2.3. +__all__ = ['Query'] class Query(object): """