summaryrefslogtreecommitdiffstats
path: root/module/lib/jinja2/meta.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-07-19 02:01:13 +0200
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-07-19 02:01:13 +0200
commitac6932aad1e0ccae18fe6332222731502fa119bc (patch)
tree350ceaf26712d4a476e19cfe83cbe14fe4ebb915 /module/lib/jinja2/meta.py
parentFix c1abc13d4dccb20f3845594c28952667573b7d0b (diff)
downloadpyload-ac6932aad1e0ccae18fe6332222731502fa119bc.tar.xz
[Lib] Updated jinja2 to v2.7.3 and markupsafe to v0.23
Diffstat (limited to 'module/lib/jinja2/meta.py')
-rw-r--r--module/lib/jinja2/meta.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/module/lib/jinja2/meta.py b/module/lib/jinja2/meta.py
index 3a779a5e9..3110cff60 100644
--- a/module/lib/jinja2/meta.py
+++ b/module/lib/jinja2/meta.py
@@ -11,6 +11,7 @@
"""
from jinja2 import nodes
from jinja2.compiler import CodeGenerator
+from jinja2._compat import string_types
class TrackingCodeGenerator(CodeGenerator):
@@ -77,7 +78,7 @@ def find_referenced_templates(ast):
# something const, only yield the strings and ignore
# non-string consts that really just make no sense
if isinstance(template_name, nodes.Const):
- if isinstance(template_name.value, basestring):
+ if isinstance(template_name.value, string_types):
yield template_name.value
# something dynamic in there
else:
@@ -87,7 +88,7 @@ def find_referenced_templates(ast):
yield None
continue
# constant is a basestring, direct template name
- if isinstance(node.template.value, basestring):
+ if isinstance(node.template.value, string_types):
yield node.template.value
# a tuple or list (latter *should* not happen) made of consts,
# yield the consts that are strings. We could warn here for
@@ -95,7 +96,7 @@ def find_referenced_templates(ast):
elif isinstance(node, nodes.Include) and \
isinstance(node.template.value, (tuple, list)):
for template_name in node.template.value:
- if isinstance(template_name, basestring):
+ if isinstance(template_name, string_types):
yield template_name
# something else we don't care about, we could warn here
else: