mirror of
https://github.com/django/django.git
synced 2024-12-25 02:26:12 +00:00
Fixed #13123 -- Cleaned up template loader for PyPy compatibility. Thanks to avostryakov for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
10de2a837f
commit
003fe52225
@ -48,9 +48,9 @@ class BaseLoader(object):
|
|||||||
template = get_template_from_string(source, origin, template_name)
|
template = get_template_from_string(source, origin, template_name)
|
||||||
return template, None
|
return template, None
|
||||||
except TemplateDoesNotExist:
|
except TemplateDoesNotExist:
|
||||||
# If compiling the template we found raises TemplateDoesNotExist, back off to
|
# If compiling the template we found raises TemplateDoesNotExist, back off to
|
||||||
# returning the source and display name for the template we were asked to load.
|
# returning the source and display name for the template we were asked to load.
|
||||||
# This allows for correct identification (later) of the actual template that does
|
# This allows for correct identification (later) of the actual template that does
|
||||||
# not exist.
|
# not exist.
|
||||||
return source, display_name
|
return source, display_name
|
||||||
|
|
||||||
@ -85,7 +85,7 @@ def make_origin(display_name, loader, name, dirs):
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
def find_template_loader(loader):
|
def find_template_loader(loader):
|
||||||
if hasattr(loader, '__iter__'):
|
if isinstance(loader, (tuple, list)):
|
||||||
loader, args = loader[0], loader[1:]
|
loader, args = loader[0], loader[1:]
|
||||||
else:
|
else:
|
||||||
args = []
|
args = []
|
||||||
|
Loading…
Reference in New Issue
Block a user