From 1070c57b83efdfd4fbed09280fcdaafc6d9c1a81 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon, 11 Oct 2010 12:20:07 +0000
Subject: 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
---
 django/template/loader.py                  | 2 +-
 django/template/loaders/app_directories.py | 2 +-
 django/template/loaders/eggs.py            | 2 +-
 django/template/loaders/filesystem.py      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'django/template')

diff --git a/django/template/loader.py b/django/template/loader.py
index b8077522fc..9ba0f2c052 100644
--- a/django/template/loader.py
+++ b/django/template/loader.py
@@ -142,7 +142,7 @@ def find_template_source(name, dirs=None):
     import warnings
     warnings.warn(
         "`django.template.loaders.find_template_source` is deprecated; use `django.template.loaders.find_template` instead.",
-        PendingDeprecationWarning
+        DeprecationWarning
     )
     template, origin = find_template(name, dirs)
     if hasattr(template, 'render'):
diff --git a/django/template/loaders/app_directories.py b/django/template/loaders/app_directories.py
index 3e05bf87f6..f2e7687650 100644
--- a/django/template/loaders/app_directories.py
+++ b/django/template/loaders/app_directories.py
@@ -68,7 +68,7 @@ def load_template_source(template_name, template_dirs=None):
     import warnings
     warnings.warn(
         "'django.template.loaders.app_directories.load_template_source' is deprecated; use 'django.template.loaders.app_directories.Loader' instead.",
-        PendingDeprecationWarning
+        DeprecationWarning
     )
     return _loader.load_template_source(template_name, template_dirs)
 load_template_source.is_usable = True
diff --git a/django/template/loaders/eggs.py b/django/template/loaders/eggs.py
index 998693e4e6..2581949735 100644
--- a/django/template/loaders/eggs.py
+++ b/django/template/loaders/eggs.py
@@ -33,7 +33,7 @@ def load_template_source(template_name, template_dirs=None):
     import warnings
     warnings.warn(
         "'django.template.loaders.eggs.load_template_source' is deprecated; use 'django.template.loaders.eggs.Loader' instead.",
-        PendingDeprecationWarning
+        DeprecationWarning
     )
     return _loader.load_template_source(template_name, template_dirs)
 load_template_source.is_usable = resource_string is not None
diff --git a/django/template/loaders/filesystem.py b/django/template/loaders/filesystem.py
index 7efadec938..970923b35b 100644
--- a/django/template/loaders/filesystem.py
+++ b/django/template/loaders/filesystem.py
@@ -55,7 +55,7 @@ def load_template_source(template_name, template_dirs=None):
     import warnings
     warnings.warn(
         "'django.template.loaders.filesystem.load_template_source' is deprecated; use 'django.template.loaders.filesystem.Loader' instead.",
-        PendingDeprecationWarning
+        DeprecationWarning
     )
     return _loader.load_template_source(template_name, template_dirs)
 load_template_source.is_usable = True
-- 
cgit v1.3