Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Advanced deprecations in django.template.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 4d94c0cb38624115299e19daae24d2312e60e273 1 parent 1d4390b
@freakboy3742 freakboy3742 authored
View
4 django/template/defaulttags.py
@@ -989,7 +989,7 @@ def ssi(parser, token):
import warnings
warnings.warn('The syntax for the ssi template tag is changing. Load the `ssi` tag from the `future` tag library to start using the new behavior.',
- category=PendingDeprecationWarning)
+ category=DeprecationWarning)
bits = token.contents.split()
parsed = False
@@ -1240,7 +1240,7 @@ def url(parser, token):
import warnings
warnings.warn('The syntax for the url template tag is changing. Load the `url` tag from the `future` tag library to start using the new behavior.',
- category=PendingDeprecationWarning)
+ category=DeprecationWarning)
bits = token.split_contents()
if len(bits) < 2:
View
12 django/template/loader.py
@@ -137,18 +137,6 @@ def find_template(name, dirs=None):
pass
raise TemplateDoesNotExist(name)
-def find_template_source(name, dirs=None):
- # For backward compatibility
- import warnings
- warnings.warn(
- "`django.template.loader.find_template_source` is deprecated; use `django.template.loader.find_template` instead.",
- DeprecationWarning
- )
- template, origin = find_template(name, dirs)
- if hasattr(template, 'render'):
- raise Exception("Found a compiled template that is incompatible with the deprecated `django.template.loader.find_template_source` function.")
- return template, origin
-
def get_template(template_name):
"""
Returns a compiled Template object for the given template name,
View
10 django/template/loaders/app_directories.py
@@ -62,13 +62,3 @@ def load_template_source(self, template_name, template_dirs=None):
raise TemplateDoesNotExist(template_name)
_loader = Loader()
-
-def load_template_source(template_name, template_dirs=None):
- # For backwards compatibility
- import warnings
- warnings.warn(
- "'django.template.loaders.app_directories.load_template_source' is deprecated; use 'django.template.loaders.app_directories.Loader' instead.",
- DeprecationWarning
- )
- return _loader.load_template_source(template_name, template_dirs)
-load_template_source.is_usable = True
View
9 django/template/loaders/eggs.py
@@ -28,12 +28,3 @@ def load_template_source(self, template_name, template_dirs=None):
raise TemplateDoesNotExist(template_name)
_loader = Loader()
-
-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.",
- DeprecationWarning
- )
- return _loader.load_template_source(template_name, template_dirs)
-load_template_source.is_usable = resource_string is not None
View
10 django/template/loaders/filesystem.py
@@ -49,13 +49,3 @@ def load_template_source(self, template_name, template_dirs=None):
load_template_source.is_usable = True
_loader = Loader()
-
-def load_template_source(template_name, template_dirs=None):
- # For backwards compatibility
- import warnings
- warnings.warn(
- "'django.template.loaders.filesystem.load_template_source' is deprecated; use 'django.template.loaders.filesystem.Loader' instead.",
- DeprecationWarning
- )
- return _loader.load_template_source(template_name, template_dirs)
-load_template_source.is_usable = True
Please sign in to comment.
Something went wrong with that request. Please try again.