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

2 files changed, 7 insertions, 7 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
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
index 75f6e202fa..fe34b6ab0f 100644
--- a/django/utils/translation/trans_real.py
+++ b/django/utils/translation/trans_real.py
@@ -192,7 +192,7 @@ def activate(language):
         warnings.warn(
             "The use of the language code 'no' is deprecated. "
             "Please use the 'nb' translation instead.",
-            PendingDeprecationWarning
+            DeprecationWarning
         )
     _active[currentThread()] = translation(language)
 
@@ -228,12 +228,12 @@ def get_language():
 def get_language_bidi():
     """
     Returns selected language's BiDi layout.
-    
+
     * False = left-to-right layout
     * True = right-to-left layout
     """
     from django.conf import settings
-    
+
     base_lang = get_language().split('-')[0]
     return base_lang in settings.LANGUAGES_BIDI
 
@@ -517,7 +517,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
     )
     from django.conf import settings
     date_format = ugettext('DATE_FORMAT')
@@ -540,7 +540,7 @@ 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
     )
     from django.conf import settings
     year_month_format = ugettext('YEAR_MONTH_FORMAT')