Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit19891c5

Browse files
committed
Rename treewalkers._base to .base to reflect public status
1 parent7bb34c7 commit19891c5

File tree

6 files changed

+28
-28
lines changed

6 files changed

+28
-28
lines changed

‎html5lib/tests/test_serializer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
fromhtml5libimportconstants
1111
fromhtml5lib.filters.lintimportFilterasLint
1212
fromhtml5lib.serializerimportHTMLSerializer,serialize
13-
fromhtml5lib.treewalkers._baseimportTreeWalker
13+
fromhtml5lib.treewalkers.baseimportTreeWalker
1414

1515
# pylint:disable=wrong-import-position
1616
optionals_loaded= []
File renamed without changes.

‎html5lib/treewalkers/dom.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
fromxml.domimportNode
44

5-
from .import_base
5+
from .importbase
66

77

8-
classTreeWalker(_base.NonRecursiveTreeWalker):
8+
classTreeWalker(base.NonRecursiveTreeWalker):
99
defgetNodeDetails(self,node):
1010
ifnode.nodeType==Node.DOCUMENT_TYPE_NODE:
11-
return_base.DOCTYPE,node.name,node.publicId,node.systemId
11+
returnbase.DOCTYPE,node.name,node.publicId,node.systemId
1212

1313
elifnode.nodeTypein (Node.TEXT_NODE,Node.CDATA_SECTION_NODE):
14-
return_base.TEXT,node.nodeValue
14+
returnbase.TEXT,node.nodeValue
1515

1616
elifnode.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
elifnode.nodeType==Node.COMMENT_NODE:
28-
return_base.COMMENT,node.nodeValue
28+
returnbase.COMMENT,node.nodeValue
2929

3030
elifnode.nodeTypein (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+
returnbase.UNKNOWN,node.nodeType
3535

3636
defgetFirstChild(self,node):
3737
returnnode.firstChild

‎html5lib/treewalkers/etree.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
fromsiximportstring_types
1414

15-
from .import_base
15+
from .importbase
1616
from ..utilsimportmoduleFactoryFactory
1717

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

25-
classTreeWalker(_base.NonRecursiveTreeWalker):# pylint:disable=unused-variable
25+
classTreeWalker(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
ifisinstance(node,tuple):# It might be the root Element
4141
elt,_,_,flag=node
4242
ifflagin ("text","tail"):
43-
return_base.TEXT,getattr(elt,flag)
43+
returnbase.TEXT,getattr(elt,flag)
4444
else:
4545
node=elt
4646

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

5050
ifnode.tagin ("DOCUMENT_ROOT","DOCUMENT_FRAGMENT"):
51-
return (_base.DOCUMENT,)
51+
return (base.DOCUMENT,)
5252

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

5757
elifnode.tag==ElementTreeCommentType:
58-
return_base.COMMENT,node.text
58+
returnbase.COMMENT,node.text
5959

6060
else:
6161
assertisinstance(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)ornode.text)
7878

7979
defgetFirstChild(self,node):

‎html5lib/treewalkers/genshistream.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
fromgenshi.coreimportSTART,END,XML_NAMESPACE,DOCTYPE,TEXT
55
fromgenshi.coreimportSTART_NS,END_NS,START_CDATA,END_CDATA,PI,COMMENT
66

7-
from .import_base
7+
from .importbase
88

99
from ..constantsimportvoidElements,namespaces
1010

1111

12-
classTreeWalker(_base.TreeWalker):
12+
classTreeWalker(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‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
fromlxmlimportetree
55
from ..treebuilders.etreeimporttag_regexp
66

7-
from .import_base
7+
from .importbase
88

99
from ..importihatexml
1010

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

124124

125-
classTreeWalker(_base.NonRecursiveTreeWalker):
125+
classTreeWalker(base.NonRecursiveTreeWalker):
126126
def__init__(self,tree):
127127
# pylint:disable=redefined-variable-type
128128
ifisinstance(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
defgetNodeDetails(self,node):
138138
ifisinstance(node,tuple):# Text node
139139
node,key=node
140140
assertkeyin ("text","tail"),"Text nodes are text or tail, found %s"%key
141-
return_base.TEXT,ensure_str(getattr(node,key))
141+
returnbase.TEXT,ensure_str(getattr(node,key))
142142

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

146146
elifisinstance(node,Doctype):
147-
return_base.DOCTYPE,node.name,node.public_id,node.system_id
147+
returnbase.DOCTYPE,node.name,node.public_id,node.system_id
148148

149149
elifisinstance(node,FragmentWrapper)andnothasattr(node,"tag"):
150-
return_base.TEXT,ensure_str(node.obj)
150+
returnbase.TEXT,ensure_str(node.obj)
151151

152152
elifnode.tag==etree.Comment:
153-
return_base.COMMENT,ensure_str(node.text)
153+
returnbase.COMMENT,ensure_str(node.text)
154154

155155
elifnode.tag==etree.Entity:
156-
return_base.ENTITY,ensure_str(node.text)[1:-1]# strip &;
156+
returnbase.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)>0ornode.text)
177177

178178
defgetFirstChild(self,node):

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp