Rooba
/
tornado
mirror of https://github.com/tornadoweb/tornado.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support "from x import y" in templates, not just "import x"

This commit is contained in:
Ben Darnell 2010-11-08 10:49:03 -08:00
parent 3e44643d3b
commit 965099eda0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tornado/template.py
View File

@ -532,7 +532,8 @@ def _parse(reader, in_block=None):
raise ParseError("Extra {%% end %%} block on line %d" % line) raise ParseError("Extra {%% end %%} block on line %d" % line)
return body return body
elif operator in ("extends", "include", "set", "import", "comment"): elif operator in ("extends", "include", "set", "import", "from",
"comment"):
if operator == "comment": if operator == "comment":
continue continue
if operator == "extends": if operator == "extends":
@ -540,7 +541,7 @@ def _parse(reader, in_block=None):
if not suffix: if not suffix:
raise ParseError("extends missing file path on line %d" % line) raise ParseError("extends missing file path on line %d" % line)
block = _ExtendsBlock(suffix) block = _ExtendsBlock(suffix)
elif operator == "import": elif operator in ("import", "from"):
if not suffix: if not suffix:
raise ParseError("import missing statement on line %d" % line) raise ParseError("import missing statement on line %d" % line)
block = _Statement(contents) block = _Statement(contents)