Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Modernize the CSRF migration helper.

Thanks Lennart Regebro for spotting that code.
  • Loading branch information...
commit c6964feb54a15e87de5e0390d07fe5fff69729c7 1 parent 9c487b5
@aaugustin aaugustin authored
Showing with 4 additions and 6 deletions.
  1. +4 −6 extras/csrf_migration_helper.py
View
10 extras/csrf_migration_helper.py
@@ -143,7 +143,7 @@ def get_template_dirs():
"""
from django.conf import settings
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):
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:
(filename, line number)
"""
- retval = []
+ retval = set()
for tn in template_names:
- retval.extend(search_python(python_code, tn))
- retval = list(set(retval))
- retval.sort()
- return retval
+ retval.update(search_python(python_code, tn))
+ return sorted(retval)
def search_python(python_code, template_name):
"""
Please sign in to comment.
Something went wrong with that request. Please try again.