summaryrefslogtreecommitdiff
path: root/django/utils/translation/trans_null.py
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/utils/translation/trans_null.py
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/utils/translation/trans_null.py')
-rw-r--r--django/utils/translation/trans_null.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/utils/translation/trans_null.py b/django/utils/translation/trans_null.py
index 50f41a2c23..8a075806ec 100644
--- a/django/utils/translation/trans_null.py
+++ b/django/utils/translation/trans_null.py
@@ -59,7 +59,7 @@ def get_date_formats():
warnings.warn(
'`django.utils.translation.get_date_formats` is deprecated. '
'Please update your code to use the new i18n aware formatting.',
- PendingDeprecationWarning
+ DeprecationWarning
)
return settings.DATE_FORMAT, settings.DATETIME_FORMAT, settings.TIME_FORMAT
@@ -67,6 +67,6 @@ def get_partial_date_formats():
warnings.warn(
'`django.utils.translation.get_partial_date_formats` is deprecated. '
'Please update your code to use the new i18n aware formatting.',
- PendingDeprecationWarning
+ DeprecationWarning
)
return settings.YEAR_MONTH_FORMAT, settings.MONTH_DAY_FORMAT