paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

html_branches: Fix strict_optional errors.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-07-04 17:59:37 -07:00
committed by Tim Abbott
parent 2fb96e94f1
commit 8a03f8a070
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mypy.ini
View File

@@ -40,8 +40,5 @@ strict_optional = True
# General exclusions to work on # General exclusions to work on
[mypy-tools.lib.html_branches]
strict_optional = False
[mypy-zthumbor.loaders.helpers] [mypy-zthumbor.loaders.helpers]
strict_optional = False strict_optional = False

3
tools/lib/html_branches.py
View File

@@ -53,7 +53,7 @@ class HtmlTreeBranch:
class Node: class Node:
def __init__(self, token: Token, parent: "Optional[Node]") -> None: def __init__(self, token: Optional[Token], parent: "Optional[Node]") -> None:
# FIXME parent parameter is not used! # FIXME parent parameter is not used!
self.token = token self.token = token
self.children: List[Node] = [] self.children: List[Node] = []
@@ -133,6 +133,7 @@ def html_branches(text: str, fn: Optional[str] = None) -> List[HtmlTreeBranch]:
branches: List[HtmlTreeBranch] = [] branches: List[HtmlTreeBranch] = []
def walk(node: Node, tag_info_list: Sequence[TagInfo] = []) -> None: def walk(node: Node, tag_info_list: Sequence[TagInfo] = []) -> None:
assert node.token is not None
info = get_tag_info(node.token) info = get_tag_info(node.token)
tag_info_list = [*tag_info_list, info] tag_info_list = [*tag_info_list, info]

7
tools/tests/test_html_branches.py
View File

@@ -49,24 +49,31 @@ class TestHtmlBranches(unittest.TestCase):
tree = html_tag_tree(html) tree = html_tag_tree(html)
assert tree.children[0].token is not None
self.assertEqual(tree.children[0].token.kind, 'html_start') self.assertEqual(tree.children[0].token.kind, 'html_start')
self.assertEqual(tree.children[0].token.tag, 'html') self.assertEqual(tree.children[0].token.tag, 'html')
assert tree.children[0].children[0].token is not None
self.assertEqual(tree.children[0].children[0].token.kind, 'html_start') self.assertEqual(tree.children[0].children[0].token.kind, 'html_start')
self.assertEqual(tree.children[0].children[0].token.tag, 'head') self.assertEqual(tree.children[0].children[0].token.tag, 'head')
assert tree.children[0].children[0].children[0].token is not None
self.assertEqual(tree.children[0].children[0].children[0].token.kind, 'html_start') self.assertEqual(tree.children[0].children[0].children[0].token.kind, 'html_start')
self.assertEqual(tree.children[0].children[0].children[0].token.tag, 'title') self.assertEqual(tree.children[0].children[0].children[0].token.tag, 'title')
assert tree.children[0].children[1].token is not None
self.assertEqual(tree.children[0].children[1].token.kind, 'html_start') self.assertEqual(tree.children[0].children[1].token.kind, 'html_start')
self.assertEqual(tree.children[0].children[1].token.tag, 'body') self.assertEqual(tree.children[0].children[1].token.tag, 'body')
assert tree.children[0].children[1].children[0].token is not None
self.assertEqual(tree.children[0].children[1].children[0].token.kind, 'html_start') self.assertEqual(tree.children[0].children[1].children[0].token.kind, 'html_start')
self.assertEqual(tree.children[0].children[1].children[0].token.tag, 'p') self.assertEqual(tree.children[0].children[1].children[0].token.tag, 'p')
assert tree.children[0].children[1].children[0].children[0].token is not None
self.assertEqual(tree.children[0].children[1].children[0].children[0].token.kind, 'html_singleton') self.assertEqual(tree.children[0].children[1].children[0].children[0].token.kind, 'html_singleton')
self.assertEqual(tree.children[0].children[1].children[0].children[0].token.tag, 'br') self.assertEqual(tree.children[0].children[1].children[0].children[0].token.tag, 'br')
assert tree.children[0].children[1].children[1].token is not None
self.assertEqual(tree.children[0].children[1].children[1].token.kind, 'html_start') self.assertEqual(tree.children[0].children[1].children[1].token.kind, 'html_start')
self.assertEqual(tree.children[0].children[1].children[1].token.tag, 'p') self.assertEqual(tree.children[0].children[1].children[1].token.tag, 'p')