summaryrefslogtreecommitdiff
path: root/django/db/models/query_utils.py
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2009-12-17 22:06:41 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2009-12-17 22:06:41 +0000
commit574eafe4c08c4a63876e199e0f2657868c8d0718 (patch)
treee5c22d5015aa9b37e7a09b8d87ab69e9fde68f0b /django/db/models/query_utils.py
parent3bd849062c57d297f3b6f7cb12e4644ce19c52f8 (diff)
Fixed #11753 - Q objects with callables no longer explode on Python 2.4. Thanks, Jeremy Dunck.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/query_utils.py')
-rw-r--r--django/db/models/query_utils.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/django/db/models/query_utils.py b/django/db/models/query_utils.py
index 6a6b69013f..c5cb336f4e 100644
--- a/django/db/models/query_utils.py
+++ b/django/db/models/query_utils.py
@@ -7,16 +7,11 @@ circular import difficulties.
"""
import weakref
-from copy import deepcopy
+from django.utils.copycompat import deepcopy
from django.utils import tree
from django.utils.datastructures import SortedDict
-try:
- sorted
-except NameError:
- from django.utils.itercompat import sorted # For Python 2.3.
-
class CyclicDependency(Exception):
"""