Fixed #12164 -- Removed the Python 2.3 compatibility imports and workarounds. Thanks to timo and claudep for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13094 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 1 insertions, 6 deletions

diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 2c9ef0975b..e2d7249903 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -3,15 +3,10 @@ import urllib
 import locale
 import datetime
 import codecs
+from decimal import Decimal
 
 from django.utils.functional import Promise
 
-try:
-    from decimal import Decimal
-except ImportError:
-    from django.utils._decimal import Decimal # Python 2.3 fallback
-
-
 class DjangoUnicodeDecodeError(UnicodeDecodeError):
     def __init__(self, obj, *args):
         self.obj = obj