Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 19891c5

Browse filesBrowse files
gsneddersgsnedders
committed
Rename treewalkers._base to .base to reflect public status
1 parent 7bb34c7 commit 19891c5
Copy full SHA for 19891c5

File tree

6 files changed

+28
-28
lines changed
Filter options

6 files changed

+28
-28
lines changed

‎html5lib/tests/test_serializer.py

Copy file name to clipboardExpand all lines: html5lib/tests/test_serializer.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from html5lib import constants
1111
from html5lib.filters.lint import Filter as Lint
1212
from html5lib.serializer import HTMLSerializer, serialize
13-
from html5lib.treewalkers._base import TreeWalker
13+
from html5lib.treewalkers.base import TreeWalker
1414

1515
# pylint:disable=wrong-import-position
1616
optionals_loaded = []

‎html5lib/treewalkers/_base.py renamed to ‎html5lib/treewalkers/base.py

Copy file name to clipboard
File renamed without changes.

‎html5lib/treewalkers/dom.py

Copy file name to clipboardExpand all lines: html5lib/treewalkers/dom.py
+8-8Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
from xml.dom import Node
44

5-
from . import _base
5+
from . import base
66

77

8-
class TreeWalker(_base.NonRecursiveTreeWalker):
8+
class TreeWalker(base.NonRecursiveTreeWalker):
99
def getNodeDetails(self, node):
1010
if node.nodeType == Node.DOCUMENT_TYPE_NODE:
11-
return _base.DOCTYPE, node.name, node.publicId, node.systemId
11+
return base.DOCTYPE, node.name, node.publicId, node.systemId
1212

1313
elif node.nodeType in (Node.TEXT_NODE, Node.CDATA_SECTION_NODE):
14-
return _base.TEXT, node.nodeValue
14+
return base.TEXT, node.nodeValue
1515

1616
elif node.nodeType == Node.ELEMENT_NODE:
1717
attrs = {}
@@ -21,17 +21,17 @@ def getNodeDetails(self, node):
2121
attrs[(attr.namespaceURI, attr.localName)] = attr.value
2222
else:
2323
attrs[(None, attr.name)] = attr.value
24-
return (_base.ELEMENT, node.namespaceURI, node.nodeName,
24+
return (base.ELEMENT, node.namespaceURI, node.nodeName,
2525
attrs, node.hasChildNodes())
2626

2727
elif node.nodeType == Node.COMMENT_NODE:
28-
return _base.COMMENT, node.nodeValue
28+
return base.COMMENT, node.nodeValue
2929

3030
elif node.nodeType in (Node.DOCUMENT_NODE, Node.DOCUMENT_FRAGMENT_NODE):
31-
return (_base.DOCUMENT,)
31+
return (base.DOCUMENT,)
3232

3333
else:
34-
return _base.UNKNOWN, node.nodeType
34+
return base.UNKNOWN, node.nodeType
3535

3636
def getFirstChild(self, node):
3737
return node.firstChild

‎html5lib/treewalkers/etree.py

Copy file name to clipboardExpand all lines: html5lib/treewalkers/etree.py
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from six import string_types
1414

15-
from . import _base
15+
from . import base
1616
from ..utils import moduleFactoryFactory
1717

1818
tag_regexp = re.compile("{([^}]*)}(.*)")
@@ -22,7 +22,7 @@ def getETreeBuilder(ElementTreeImplementation):
2222
ElementTree = ElementTreeImplementation
2323
ElementTreeCommentType = ElementTree.Comment("asd").tag
2424

25-
class TreeWalker(_base.NonRecursiveTreeWalker): # pylint:disable=unused-variable
25+
class TreeWalker(base.NonRecursiveTreeWalker): # pylint:disable=unused-variable
2626
"""Given the particular ElementTree representation, this implementation,
2727
to avoid using recursion, returns "nodes" as tuples with the following
2828
content:
@@ -40,22 +40,22 @@ def getNodeDetails(self, node):
4040
if isinstance(node, tuple): # It might be the root Element
4141
elt, _, _, flag = node
4242
if flag in ("text", "tail"):
43-
return _base.TEXT, getattr(elt, flag)
43+
return base.TEXT, getattr(elt, flag)
4444
else:
4545
node = elt
4646

4747
if not(hasattr(node, "tag")):
4848
node = node.getroot()
4949

5050
if node.tag in ("DOCUMENT_ROOT", "DOCUMENT_FRAGMENT"):
51-
return (_base.DOCUMENT,)
51+
return (base.DOCUMENT,)
5252

5353
elif node.tag == "<!DOCTYPE>":
54-
return (_base.DOCTYPE, node.text,
54+
return (base.DOCTYPE, node.text,
5555
node.get("publicId"), node.get("systemId"))
5656

5757
elif node.tag == ElementTreeCommentType:
58-
return _base.COMMENT, node.text
58+
return base.COMMENT, node.text
5959

6060
else:
6161
assert isinstance(node.tag, string_types), type(node.tag)
@@ -73,7 +73,7 @@ def getNodeDetails(self, node):
7373
attrs[(match.group(1), match.group(2))] = value
7474
else:
7575
attrs[(None, name)] = value
76-
return (_base.ELEMENT, namespace, tag,
76+
return (base.ELEMENT, namespace, tag,
7777
attrs, len(node) or node.text)
7878

7979
def getFirstChild(self, node):

‎html5lib/treewalkers/genshistream.py

Copy file name to clipboardExpand all lines: html5lib/treewalkers/genshistream.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
from genshi.core import START, END, XML_NAMESPACE, DOCTYPE, TEXT
55
from genshi.core import START_NS, END_NS, START_CDATA, END_CDATA, PI, COMMENT
66

7-
from . import _base
7+
from . import base
88

99
from ..constants import voidElements, namespaces
1010

1111

12-
class TreeWalker(_base.TreeWalker):
12+
class TreeWalker(base.TreeWalker):
1313
def __iter__(self):
1414
# Buffer the events so we can pass in the following one
1515
previous = None

‎html5lib/treewalkers/lxmletree.py

Copy file name to clipboardExpand all lines: html5lib/treewalkers/lxmletree.py
+10-10Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from lxml import etree
55
from ..treebuilders.etree import tag_regexp
66

7-
from . import _base
7+
from . import base
88

99
from .. import ihatexml
1010

@@ -122,7 +122,7 @@ def __len__(self):
122122
return len(self.obj)
123123

124124

125-
class TreeWalker(_base.NonRecursiveTreeWalker):
125+
class TreeWalker(base.NonRecursiveTreeWalker):
126126
def __init__(self, tree):
127127
# pylint:disable=redefined-variable-type
128128
if isinstance(tree, list):
@@ -131,29 +131,29 @@ def __init__(self, tree):
131131
else:
132132
self.fragmentChildren = set()
133133
tree = Root(tree)
134-
_base.NonRecursiveTreeWalker.__init__(self, tree)
134+
base.NonRecursiveTreeWalker.__init__(self, tree)
135135
self.filter = ihatexml.InfosetFilter()
136136

137137
def getNodeDetails(self, node):
138138
if isinstance(node, tuple): # Text node
139139
node, key = node
140140
assert key in ("text", "tail"), "Text nodes are text or tail, found %s" % key
141-
return _base.TEXT, ensure_str(getattr(node, key))
141+
return base.TEXT, ensure_str(getattr(node, key))
142142

143143
elif isinstance(node, Root):
144-
return (_base.DOCUMENT,)
144+
return (base.DOCUMENT,)
145145

146146
elif isinstance(node, Doctype):
147-
return _base.DOCTYPE, node.name, node.public_id, node.system_id
147+
return base.DOCTYPE, node.name, node.public_id, node.system_id
148148

149149
elif isinstance(node, FragmentWrapper) and not hasattr(node, "tag"):
150-
return _base.TEXT, ensure_str(node.obj)
150+
return base.TEXT, ensure_str(node.obj)
151151

152152
elif node.tag == etree.Comment:
153-
return _base.COMMENT, ensure_str(node.text)
153+
return base.COMMENT, ensure_str(node.text)
154154

155155
elif node.tag == etree.Entity:
156-
return _base.ENTITY, ensure_str(node.text)[1:-1] # strip &;
156+
return base.ENTITY, ensure_str(node.text)[1:-1] # strip &;
157157

158158
else:
159159
# This is assumed to be an ordinary element
@@ -172,7 +172,7 @@ def getNodeDetails(self, node):
172172
attrs[(match.group(1), match.group(2))] = value
173173
else:
174174
attrs[(None, name)] = value
175-
return (_base.ELEMENT, namespace, self.filter.fromXmlName(tag),
175+
return (base.ELEMENT, namespace, self.filter.fromXmlName(tag),
176176
attrs, len(node) > 0 or node.text)
177177

178178
def getFirstChild(self, node):

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.