summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-10-11 12:20:07 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-10-11 12:20:07 +0000
commit1070c57b83efdfd4fbed09280fcdaafc6d9c1a81 (patch)
tree93b5721fe4e0664b993dd0d0b1dee544df304b22 /django/forms
parent5e5be2c44caaae3192a9f8ae1ce0adc0da3d8c4d (diff)
Fixed #14436 -- Escalated 1.2 PendingDeprecationWarnings to DeprecationWarnings, and removed 1.1 deprecated code.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/fields.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py
index 51551ded47..e2e712f0c1 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -50,7 +50,7 @@ def en_format(name):
from django.conf.locale.en import formats
warnings.warn(
"`django.forms.fields.DEFAULT_%s` is deprecated; use `django.utils.formats.get_format('%s')` instead." % (name, name),
- PendingDeprecationWarning
+ DeprecationWarning
)
return getattr(formats, name)