summaryrefslogtreecommitdiff
path: root/django/forms/fields.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/forms/fields.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/forms/fields.py')
-rw-r--r--django/forms/fields.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py
index 0aef355d0f..c0ee2f0955 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -2,28 +2,19 @@
Field classes.
"""
-import copy
import datetime
import os
import re
import time
import urlparse
+from decimal import Decimal, DecimalException
try:
from cStringIO import StringIO
except ImportError:
from StringIO import StringIO
-# Python 2.3 fallbacks
-try:
- from decimal import Decimal, DecimalException
-except ImportError:
- from django.utils._decimal import Decimal, DecimalException
-try:
- set
-except NameError:
- from sets import Set as set
-
import django.core.exceptions
+import django.utils.copycompat as copy
from django.utils.translation import ugettext_lazy as _
from django.utils.encoding import smart_unicode, smart_str