[1.1.X] Fixed a bunch of Python 2.3 incompatibilities that had crept into the 1.1.X branch.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12595 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 16 insertions, 2 deletions

diff --git a/django/forms/fields.py b/django/forms/fields.py
index 18174360f6..8d4fbc434b 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -7,7 +7,6 @@ import os
 import re
 import time
 import urlparse
-from decimal import Decimal, DecimalException
 try:
     from cStringIO import StringIO
 except ImportError:
@@ -18,6 +17,16 @@ import django.utils.copycompat as copy
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import smart_unicode, smart_str
 
+# 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
+
 from util import ErrorList, ValidationError
 from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, FileInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple, DateInput, DateTimeInput, TimeInput, SplitDateTimeWidget, SplitHiddenDateTimeWidget
 
@@ -489,7 +498,7 @@ class ImageField(FileField):
             return None
         elif not data and initial:
             return initial
-            
+
         # Try to import PIL in either of the two ways it can end up installed.
         try:
             from PIL import Image
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index a39c19872e..36018979b8 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -2,6 +2,11 @@
 HTML Widget classes
 """
 
+try:
+    set
+except NameError:
+    from sets import Set as set   # Python 2.3 fallback
+
 import django.utils.copycompat as copy
 from itertools import chain
 from django.conf import settings