10000 Jinja by aelaguiz · Pull Request #1 · cratejoy/html5lib-python · GitHub
[go: up one dir, main page]
Skip to content

Jinja #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Jinja #1

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
86c6f80
WIP - Jinja parsing
aelaguiz Dec 25, 2014
24ecb5b
Parsing works a lot better
aelaguiz Dec 26, 2014
c12b08f
Refactored unit tests
aelaguiz Dec 26, 2014
2ffcf5c
Fixed tests, added support for import extend & include
aelaguiz Dec 26, 2014
c7461f9
Works with inline if
aelaguiz Dec 26, 2014
2db2cb0
Added jinja comment suport
aelaguiz Dec 26, 2014
1eb1bee
Fixed if conditions
aelaguiz Dec 27, 2014
7a5a490
WIP
aelaguiz Dec 27, 2014
197daa1
More tolerant of jinja fragments
aelaguiz Dec 27, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
WIP
  • Loading branch information
@aelaguiz
aelaguiz committed Dec 27, 2014
commit 7a5a4902d5b3ee8134140696e6d25059ceb161cd
4 changes: 2 additions & 2 deletions html5lib/html5parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def mainLoop(self):
for token in self.normalizedTokens():
new_token = token
while new_token is not None:
log.debug(u"Token {} Phase = {}".format(new_token, self.phase))
#log.debug(u"Token {} Phase = {}".format(new_token, self.phase))
currentNode = self.tree.openElements[-1] if self.tree.openElements else None
currentNodeNamespace = currentNode.namespace if currentNode else None
currentNodeName = currentNode.name if currentNode else None
Expand Down Expand Up @@ -644,7 +644,7 @@ def closeOpenIf(self, token):
log = logging.getLogger(u"html5lib")

for node in self.tree.openElements[::-1]:
log.debug(u"Prev {} Cur {}".format(node.name, token['name']))
#log.debug(u"Prev {} Cur {}".format(node.name, token['name']))

if node.name == token["name"] or (node.name in ["jinjaif", "jinjaelif"] and token["name"] in ["jinjaelse", "jinjaelif"]):
self.tree.generateImpliedEndTags(exclude=token["name"])
Expand Down
0