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

Commitf1d1d0a

Browse files
committed
Merge remote-tracking branch 'origin/master' into escape-characters-serializer
2 parents9dac020 +f130676 commitf1d1d0a

File tree

6 files changed

+60
-38
lines changed

6 files changed

+60
-38
lines changed

‎CHANGES.rst‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,31 @@
11
Change Log
22
----------
33

4+
0.99
5+
~~~~
6+
7+
Released on September 10, 2013
8+
9+
* No library changes from 1.0b3; released as 0.99 as pip has changed
10+
behaviour from 1.4 to avoid installing pre-release versions per
11+
PEP 440.
12+
13+
14+
1.0b3
15+
~~~~~
16+
17+
Released on July 24, 2013
18+
19+
* Removed ``RecursiveTreeWalker`` from ``treewalkers._base``. Any
20+
implementation using it should be moved to
21+
``NonRecursiveTreeWalker``, as everything bundled with html5lib has
22+
for years.
23+
24+
* Fix #67 so that ``BufferedStream`` to correctly returns a bytes
25+
object, thereby fixing any case where html5lib is passed a
26+
non-seekable RawIOBase-like object.
27+
28+
429
1.0b2
530
~~~~~
631

‎README.rst‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,29 @@ a treebuilder:
4141
withopen("mydocument.html","rb")as f:
4242
lxml_etree_document= html5lib.parse(f,treebuilder="lxml")
4343
44+
When using with ``urllib2`` (Python 2), the charset from HTTP should be
45+
pass into html5lib as follows:
46+
47+
..code-block::python
48+
49+
from contextlibimport closing
50+
from urllib2import urlopen
51+
import html5lib
52+
53+
with closing(urlopen("http://example.com/"))as f:
54+
document= html5lib.parse(f,encoding=f.info().getparam("charset"))
55+
56+
When using with ``urllib.request`` (Python 3), the charset from HTTP
57+
should be pass into html5lib as follows:
58+
59+
..code-block::python
60+
61+
from urllib.requestimport urlopen
62+
import html5lib
63+
64+
with urlopen("http://example.com/")as f:
65+
document= html5lib.parse(f,encoding=f.info().get_content_charset())
66+
4467
To have more control over the parser, create a parser object explicitly.
4568
For instance, to make the parser raise exceptions on parse errors, use:
4669

‎html5lib/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020

2121
__all__= ["HTMLParser","parse","parseFragment","getTreeBuilder",
2222
"getTreeWalker","serialize"]
23-
__version__="1.0b2"
23+
__version__="0.999-dev"

‎html5lib/tests/test_treewalkers.py‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,6 @@ def PullDOMAdapter(node):
8383
"walker":treewalkers.getTreeWalker("lxml")}
8484

8585

86-
# Try whatever etree implementations are available from a list that are
87-
#"supposed" to work
88-
try:
89-
importpxdom
90-
treeTypes['pxdom']= \
91-
{"builder":treebuilders.getTreeBuilder("dom",pxdom),
92-
"walker":treewalkers.getTreeWalker("dom")}
93-
exceptImportError:
94-
pass
95-
9686
try:
9787
fromgenshi.coreimportQName,Attrs
9888
fromgenshi.coreimportSTART,END,TEXT,COMMENT,DOCTYPE

‎html5lib/treewalkers/_base.py‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@
44
importgettext
55
_=gettext.gettext
66

7+
fromxml.domimportNode
8+
9+
DOCUMENT=Node.DOCUMENT_NODE
10+
DOCTYPE=Node.DOCUMENT_TYPE_NODE
11+
TEXT=Node.TEXT_NODE
12+
ELEMENT=Node.ELEMENT_NODE
13+
COMMENT=Node.COMMENT_NODE
14+
ENTITY=Node.ENTITY_NODE
15+
UNKNOWN="<#UNKNOWN#>"
16+
717
from ..constantsimportvoidElements,spaceCharacters
818
spaceCharacters="".join(spaceCharacters)
919

@@ -115,32 +125,6 @@ def unknown(self, nodeType):
115125
returnself.error(_("Unknown node type: ")+nodeType)
116126

117127

118-
classRecursiveTreeWalker(TreeWalker):
119-
defwalkChildren(self,node):
120-
raiseNotImplementedError
121-
122-
defelement(self,node,namespace,name,attrs,hasChildren):
123-
ifnameinvoidElements:
124-
fortokeninself.emptyTag(namespace,name,attrs,hasChildren):
125-
yieldtoken
126-
else:
127-
yieldself.startTag(name,attrs)
128-
ifhasChildren:
129-
fortokeninself.walkChildren(node):
130-
yieldtoken
131-
yieldself.endTag(name)
132-
133-
fromxml.domimportNode
134-
135-
DOCUMENT=Node.DOCUMENT_NODE
136-
DOCTYPE=Node.DOCUMENT_TYPE_NODE
137-
TEXT=Node.TEXT_NODE
138-
ELEMENT=Node.ELEMENT_NODE
139-
COMMENT=Node.COMMENT_NODE
140-
ENTITY=Node.ENTITY_NODE
141-
UNKNOWN="<#UNKNOWN#>"
142-
143-
144128
classNonRecursiveTreeWalker(TreeWalker):
145129
defgetNodeDetails(self,node):
146130
raiseNotImplementedError

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
long_description=readme_file.read()+'\n'+changes_file.read()
3030

3131
setup(name='html5lib',
32-
version='1.0b2',
32+
version='0.999-dev',
3333
url='https://github.com/html5lib/html5lib-python',
3434
license="MIT License",
3535
description='HTML parser based on the WHATWG HTML specifcation',

0 commit comments

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