mirror of
https://github.com/django/django.git
synced 2024-12-22 17:16:24 +00:00
Modernize the CSRF migration helper.
Thanks Lennart Regebro for spotting that code.
This commit is contained in:
parent
9c487b5974
commit
c6964feb54
@ -143,7 +143,7 @@ def get_template_dirs():
|
|||||||
"""
|
"""
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
dirs = set()
|
dirs = set()
|
||||||
if ('django.template.loaders.filesystem.load_template_source' in settings.TEMPLATE_LOADERS
|
if ('django.template.loaders.filesystem.load_template_source' in settings.TEMPLATE_LOADERS
|
||||||
or 'django.template.loaders.filesystem.Loader' in settings.TEMPLATE_LOADERS):
|
or 'django.template.loaders.filesystem.Loader' in settings.TEMPLATE_LOADERS):
|
||||||
dirs.update(map(unicode, settings.TEMPLATE_DIRS))
|
dirs.update(map(unicode, settings.TEMPLATE_DIRS))
|
||||||
|
|
||||||
@ -281,12 +281,10 @@ def search_python_list(python_code, template_names):
|
|||||||
Returns a list of tuples, each one being:
|
Returns a list of tuples, each one being:
|
||||||
(filename, line number)
|
(filename, line number)
|
||||||
"""
|
"""
|
||||||
retval = []
|
retval = set()
|
||||||
for tn in template_names:
|
for tn in template_names:
|
||||||
retval.extend(search_python(python_code, tn))
|
retval.update(search_python(python_code, tn))
|
||||||
retval = list(set(retval))
|
return sorted(retval)
|
||||||
retval.sort()
|
|
||||||
return retval
|
|
||||||
|
|
||||||
def search_python(python_code, template_name):
|
def search_python(python_code, template_name):
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user