Fixed django#18042 -- Advanced deprecation warnings.

Thanks Ramiro for the patch.

Author: aaugustin

django/conf/__init__.py

@@ -181,7 +181,7 @@ def compat_patch_logging_config(logging_config):
             "handler: adding implicit debug-false-only filter. "
             "See http://docs.djangoproject.com/en/dev/releases/1.4/"
             "#request-exceptions-are-now-always-logged",
-            PendingDeprecationWarning)
+            DeprecationWarning)
 
         filter_name = "require_debug_false"
 

django/conf/urls/defaults.py

@@ -1,6 +1,6 @@
 import warnings
 warnings.warn("django.conf.urls.defaults is deprecated; use django.conf.urls instead",
-              PendingDeprecationWarning)
+              DeprecationWarning)
 
 from django.conf.urls import (handler403, handler404, handler500,
         include, patterns, url)

django/contrib/admin/templatetags/adminmedia.py

@@ -11,5 +11,5 @@ def admin_media_prefix():
     """
     warnings.warn(
         "The admin_media_prefix template tag is deprecated. "
-        "Use the static template tag instead.", PendingDeprecationWarning)
+        "Use the static template tag instead.", DeprecationWarning)
     return PrefixNode.handle_simple("ADMIN_MEDIA_PREFIX")

django/contrib/databrowse/__init__.py

@@ -2,5 +2,4 @@
 from django.contrib.databrowse.sites import DatabrowsePlugin, ModelDatabrowse, DatabrowseSite, site
 
 
-warnings.warn("The Databrowse contrib app is deprecated",
-    PendingDeprecationWarning)
+warnings.warn("The Databrowse contrib app is deprecated", DeprecationWarning)

django/contrib/formtools/tests/__init__.py

@@ -7,6 +7,7 @@
 from django.contrib.formtools import preview, utils
 from django.contrib.formtools.wizard import FormWizard
 from django.test import TestCase
+from django.test.utils import get_warnings_state, restore_warnings_state
 from django.test.utils import override_settings
 from django.utils import unittest
 
@@ -40,12 +41,20 @@ class PreviewTests(TestCase):
 
     def setUp(self):
         super(PreviewTests, self).setUp()
+        self.save_warnings_state()
+        warnings.filterwarnings('ignore', category=DeprecationWarning,
+                                module='django.contrib.formtools.wizard.legacy')
+
         # Create a FormPreview instance to share between tests
         self.preview = preview.FormPreview(TestForm)
         input_template = '<input type="hidden" name="%s" value="%s" />'
         self.input = input_template % (self.preview.unused_name('stage'), "%d")
         self.test_data = {'field1':u'foo', 'field1_':u'asdf'}
 
+    def tearDown(self):
+        super(PreviewTests, self).tearDown()
+        self.restore_warnings_state()
+
     def test_unused_name(self):
         """
         Verifies name mangling to get uniue field name.

django/contrib/formtools/wizard/legacy.py

@@ -39,7 +39,7 @@ def __init__(self, form_list, initial=None):
         warnings.warn(
             'Old-style form wizards have been deprecated; use the class-based '
             'views in django.contrib.formtools.wizard.views instead.',
-            PendingDeprecationWarning)
+            DeprecationWarning)
 
     def __repr__(self):
         return "step: %d\nform_list: %s\ninitial_data: %s" % (self.step, self.form_list, self.initial)

django/contrib/gis/utils/geoip.py

@@ -10,5 +10,5 @@ class GeoIP(BaseGeoIP):
         def __init__(self, *args, **kwargs):
             warnings.warn('GeoIP class has been moved to `django.contrib.gis.geoip`, and '
                           'this shortcut will disappear in Django v1.6.',
-                          PendingDeprecationWarning, stacklevel=2)
+                          DeprecationWarning, stacklevel=2)
             super(GeoIP, self).__init__(*args, **kwargs)

django/contrib/localflavor/uk/forms.py

@@ -3,7 +3,7 @@
 import warnings
 warnings.warn(
     'The "UK" prefix for United Kingdom has been deprecated in favour of the '
-    'GB code. Please use the new GB-prefixed names.', PendingDeprecationWarning)
+    'GB code. Please use the new GB-prefixed names.', DeprecationWarning)
 
 UKPostcodeField = forms.GBPostcodeField
 UKCountySelect = forms.GBCountySelect

django/contrib/localflavor/uk/uk_regions.py

@@ -6,7 +6,7 @@
 import warnings
 warnings.warn(
     'The "UK" prefix for United Kingdom has been deprecated in favour of the '
-    'GB code. Please use the new GB-prefixed names.', PendingDeprecationWarning)
+    'GB code. Please use the new GB-prefixed names.', DeprecationWarning)
 
 UK_NATIONS_CHOICES = GB_NATIONS_CHOICES
 UK_REGION_CHOICES  = GB_REGION_CHOICES

django/core/cache/backends/memcached.py

@@ -130,7 +130,7 @@ def __init__(self, server, params):
         import warnings
         warnings.warn(
             "memcached.CacheClass has been split into memcached.MemcachedCache and memcached.PyLibMCCache. Please update your cache backend setting.",
-            PendingDeprecationWarning
+            DeprecationWarning
         )
         try:
             import memcache