summaryrefslogtreecommitdiff
path: root/django/oldforms/__init__.py
diff options
context:
space:
mode:
authorBoulder Sprinters <boulder-sprinters@djangoproject.com>2007-06-04 16:12:35 +0000
committerBoulder Sprinters <boulder-sprinters@djangoproject.com>2007-06-04 16:12:35 +0000
commitfe8c54a62a43b08b10ba343603d2b80e54d320b9 (patch)
tree625342d42b88fe4a20d11e80a38dfaf1b261a0f2 /django/oldforms/__init__.py
parent4365d6d086efaf8e8fe2a060be869c3313a356b5 (diff)
boulder-oracle-sprint: Merged to [5421]
git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@5422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/oldforms/__init__.py')
-rw-r--r--django/oldforms/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/oldforms/__init__.py b/django/oldforms/__init__.py
index eed73ab156..5814eef7ff 100644
--- a/django/oldforms/__init__.py
+++ b/django/oldforms/__init__.py
@@ -782,7 +782,7 @@ class DecimalField(TextField):
try:
import decimal
except ImportError:
- from django.utils import decimal
+ from django.utils import _decimal as decimal
try:
return decimal.Decimal(data)
except decimal.InvalidOperation, e: