mirror of
https://github.com/django/django.git
synced 2024-12-24 18:16:19 +00:00
Advanced deprecations in django.template.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
1d4390b26b
commit
4d94c0cb38
@ -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:
|
||||
|
@ -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,
|
||||
|
@ -62,13 +62,3 @@ class Loader(BaseLoader):
|
||||
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
|
||||
|
@ -28,12 +28,3 @@ class Loader(BaseLoader):
|
||||
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
|
||||
|
@ -49,13 +49,3 @@ class Loader(BaseLoader):
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user