mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 01:25:32 +00:00
Code Issues 32 Releases Wiki Activity

Advanced deprecations in django.template.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee
2011-04-02 08:41:03 +00:00
parent 1d4390b26b
commit 4d94c0cb38
5 changed files with 2 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
django/template/defaulttags.py
View File

@@ -989,7 +989,7 @@ def ssi(parser, token):
import warnings 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.', 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() bits = token.contents.split()
parsed = False parsed = False
@@ -1240,7 +1240,7 @@ def url(parser, token):
import warnings 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.', 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() bits = token.split_contents()
if len(bits) < 2: if len(bits) < 2:

12
django/template/loader.py
View File

@@ -137,18 +137,6 @@ def find_template(name, dirs=None):
pass pass
raise TemplateDoesNotExist(name) 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): def get_template(template_name):
""" """
Returns a compiled Template object for the given template name, Returns a compiled Template object for the given template name,

10
django/template/loaders/app_directories.py
View File

@@ -62,13 +62,3 @@ class Loader(BaseLoader):
raise TemplateDoesNotExist(template_name) raise TemplateDoesNotExist(template_name)
_loader = Loader() _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

9
django/template/loaders/eggs.py
View File

@@ -28,12 +28,3 @@ class Loader(BaseLoader):
raise TemplateDoesNotExist(template_name) raise TemplateDoesNotExist(template_name)
_loader = Loader() _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

10
django/template/loaders/filesystem.py
View File

@@ -49,13 +49,3 @@ class Loader(BaseLoader):
load_template_source.is_usable = True load_template_source.is_usable = True
_loader = Loader() _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