|
2 | 2 | import unittest
|
3 | 3 | from support import simplejson, html5lib_test_files
|
4 | 4 |
|
5 |
| -from html5lib import html5parser, serializer |
| 5 | +from html5lib import html5parser, serializer, constants |
6 | 6 | from html5lib.treewalkers._base import TreeWalker
|
7 | 7 |
|
| 8 | +default_namespace = constants.namespaces["html"] |
| 9 | + |
8 | 10 | class JsonWalker(TreeWalker):
|
9 | 11 | def __iter__(self):
|
10 | 12 | for token in self.tree:
|
11 | 13 | type = token[0]
|
12 | 14 | if type == "StartTag":
|
13 |
| - yield self.startTag(token[1], token[2]) |
| 15 | + if len(token) == 4: |
| 16 | + namespace, name, attrib = token[1:] |
| 17 | + else: |
| 18 | + namespace = default_namespace |
| 19 | + name, attrib = token[1:] |
| 20 | + yield self.startTag(namespace, name, attrib) |
14 | 21 | elif type == "EndTag":
|
15 |
| - yield self.endTag(token[1]) |
| 22 | + if len(token) == 3: |
| 23 | + namespace, name = token[1:] |
| 24 | + else: |
| 25 | + namespace = default_namespace |
| 26 | + name= token[1] |
| 27 | + yield self.endTag(namespace, name) |
16 | 28 | elif type == "EmptyTag":
|
17 |
| - for token in self.emptyTag(token[1], token[2]): |
| 29 | + if len(token) == 4: |
| 30 | + namespace, name, attrib = token[1:] |
| 31 | + else: |
| 32 | + namespace = default_namespace |
| 33 | + name, attrib = token[1:] |
| 34 | + for token in self.emptyTag(namespace, name, attrib): |
18 | 35 | yield token
|
19 | 36 | elif type == "Comment":
|
20 | 37 | yield self.comment(token[1])
|
|
0 commit comments