html5lib/html5lib-pythonPublic

NotificationsYou must be signed in to change notification settings
Fork294
Star1.2k

Commita8ba43e

authored

Merge pull request#270 from gsnedders/rename_stuff

2 parents945911b +8cb144b commita8ba43eCopy full SHA for a8ba43e

File tree

40 files changed

+219

-275

lines changed

CHANGES.rst
doc
html5lib
- _ihatexml.py
- _inputstream.py
- _tokenizer.py
- _trie
- _utils.py
- filters
- html5parser.py
- serializer
  - __init__.py
- serializer.py
- tests
- treebuilders
- treewalkers
parse.py

40 files changed

+219

-275

lines changed

`‎CHANGES.rst`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,20 @@ Released on XXX`
`50`	`50`	`with a set of keyword arguments: override_encoding, transport_encoding,`
`51`	`51`	`same_origin_parent_encoding, likely_encoding, and default_encoding.**`
`52`	`52`
	`53`	`+* **Move filters._base, treebuilder._base, and treewalkers._base to .base`
	`54`	`+ to clarify their status as public.**`
	`55`	`+`
	`56`	`+* **Get rid of the sanitizer package. Merge sanitizer.sanitize into the`
	`57`	`+ sanitizer.htmlsanitizer module and move that to saniziter. This means`
	`58`	`+ anyone who used sanitizer.sanitize or sanitizer.HTMLSanitizer needs no`
	`59`	`+ code changes.**`
	`60`	`+`
	`61`	`+* **Rename treewalkers.lxmletree to .etree_lxml and`
	`62`	`+ treewalkers.genshistream to .genshi to have a consistent API.**`
	`63`	`+`
	`64`	`+* Move a whole load of stuff (inputstream, ihatexml, trie, tokenizer,`
	`65`	`+ utils) to be underscore prefixed to clarify their status as private.`
	`66`	`+`
`53`	`67`
`54`	`68`	`0.9999999/1.0b8`
`55`	`69`	`~~~~~~~~~~~~~~~`

`‎doc/html5lib.filters.rst`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`filters Package`
`2`	`2`	`===============`
`3`	`3`
`4`		-:mod:`_base` Module
	`4`	+:mod:`base` Module
`5`	`5`	`-------------------`
`6`	`6`
`7`		`-..automodule::html5lib.filters._base`
	`7`	`+..automodule::html5lib.filters.base`
`8`	`8`	`:members:`
`9`	`9`	`:undoc-members:`
`10`	`10`	`:show-inheritance:`

`‎doc/html5lib.rst`

Lines changed: 2 additions & 35 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,42 +25,10 @@ html5lib Package`
`25`	`25`	`:undoc-members:`
`26`	`26`	`:show-inheritance:`
`27`	`27`
`28`		-:mod:`ihatexml` Module
	`28`	+:mod:`serializer` Module
`29`	`29`	`----------------------`
`30`	`30`
`31`		`-..automodule::html5lib.ihatexml`
`32`		`-:members:`
`33`		`-:undoc-members:`
`34`		`-:show-inheritance:`
`35`		`-`
`36`		-:mod:`inputstream` Module
`37`		`--------------------------`
`38`		`-`
`39`		`-..automodule::html5lib.inputstream`
`40`		`-:members:`
`41`		`-:undoc-members:`
`42`		`-:show-inheritance:`
`43`		`-`
`44`		-:mod:`sanitizer` Module
`45`		`------------------------`
`46`		`-`
`47`		`-..automodule::html5lib.sanitizer`
`48`		`-:members:`
`49`		`-:undoc-members:`
`50`		`-:show-inheritance:`
`51`		`-`
`52`		-:mod:`tokenizer` Module
`53`		`------------------------`
`54`		`-`
`55`		`-..automodule::html5lib.tokenizer`
`56`		`-:members:`
`57`		`-:undoc-members:`
`58`		`-:show-inheritance:`
`59`		`-`
`60`		-:mod:`utils` Module
`61`		`--------------------`
`62`		`-`
`63`		`-..automodule::html5lib.utils`
	`31`	`+..automodule::html5lib.serializer`
`64`	`32`	`:members:`
`65`	`33`	`:undoc-members:`
`66`	`34`	`:show-inheritance:`
`@@ -71,7 +39,6 @@ Subpackages`
`71`	`39`	`..toctree::`
`72`	`40`
`73`	`41`	`html5lib.filters`
`74`		`-html5lib.serializer`
`75`	`42`	`html5lib.treebuilders`
`76`	`43`	`html5lib.treewalkers`
`77`	`44`

`‎doc/html5lib.serializer.rst`

Lines changed: 0 additions & 19 deletions

This file was deleted.

`‎doc/html5lib.treebuilders.rst`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@ treebuilders Package`
`9`	`9`	`:undoc-members:`
`10`	`10`	`:show-inheritance:`
`11`	`11`
`12`		-:mod:`_base` Module
	`12`	+:mod:`base` Module
`13`	`13`	`-------------------`
`14`	`14`
`15`		`-..automodule::html5lib.treebuilders._base`
	`15`	`+..automodule::html5lib.treebuilders.base`
`16`	`16`	`:members:`
`17`	`17`	`:undoc-members:`
`18`	`18`	`:show-inheritance:`

`‎doc/html5lib.treewalkers.rst`

Lines changed: 10 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@ treewalkers Package`
`9`	`9`	`:undoc-members:`
`10`	`10`	`:show-inheritance:`
`11`	`11`
`12`		-:mod:`_base` Module
	`12`	+:mod:`base` Module
`13`	`13`	`-------------------`
`14`	`14`
`15`		`-..automodule::html5lib.treewalkers._base`
	`15`	`+..automodule::html5lib.treewalkers.base`
`16`	`16`	`:members:`
`17`	`17`	`:undoc-members:`
`18`	`18`	`:show-inheritance:`
`@@ -33,18 +33,19 @@ treewalkers Package`
`33`	`33`	`:undoc-members:`
`34`	`34`	`:show-inheritance:`
`35`	`35`
`36`		-:mod:`genshistream` Module
`37`		`---------------------------`
	`36`	+:mod:`etree_lxml` Module
	`37`	`+-----------------------`
`38`	`38`
`39`		`-..automodule::html5lib.treewalkers.genshistream`
	`39`	`+..automodule::html5lib.treewalkers.etree_lxml`
`40`	`40`	`:members:`
`41`	`41`	`:undoc-members:`
`42`	`42`	`:show-inheritance:`
`43`	`43`
`44`		-:mod:`lxmletree` Module
`45`		`------------------------`
`46`	`44`
`47`		`-..automodule::html5lib.treewalkers.lxmletree`
	`45`	+:mod:`genshi` Module
	`46`	`+--------------------------`
	`47`	`+`
	`48`	`+..automodule::html5lib.treewalkers.genshi`
`48`	`49`	`:members:`
`49`	`50`	`:undoc-members:`
`50`		`-:show-inheritance:`
	`51`	`+:show-inheritance:`

`‎html5lib/ihatexml.pyrenamed to‎html5lib/_ihatexml.py`

File renamed without changes.

`‎html5lib/inputstream.pyrenamed to‎html5lib/_inputstream.py`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`from .constantsimportEOF,spaceCharacters,asciiLetters,asciiUppercase`
`12`	`12`	`from .constantsimportReparseException`
`13`		`-from .importutils`
	`13`	`+from .import_utils`
`14`	`14`
`15`	`15`	`fromioimportStringIO`
`16`	`16`
`@@ -28,7 +28,7 @@`
`28`	`28`
`29`	`29`	`invalid_unicode_no_surrogate="[\u0001-\u0008\u000B\u000E-\u001F\u007F-\u009F\uFDD0-\uFDEF\uFFFE\uFFFF\U0001FFFE\U0001FFFF\U0002FFFE\U0002FFFF\U0003FFFE\U0003FFFF\U0004FFFE\U0004FFFF\U0005FFFE\U0005FFFF\U0006FFFE\U0006FFFF\U0007FFFE\U0007FFFF\U0008FFFE\U0008FFFF\U0009FFFE\U0009FFFF\U000AFFFE\U000AFFFF\U000BFFFE\U000BFFFF\U000CFFFE\U000CFFFF\U000DFFFE\U000DFFFF\U000EFFFE\U000EFFFF\U000FFFFE\U000FFFFF\U0010FFFE\U0010FFFF]"# noqa`
`30`	`30`
`31`		`-ifutils.supports_lone_surrogates:`
	`31`	`+if_utils.supports_lone_surrogates:`
`32`	`32`	`# Use one extra step of indirection and create surrogates with`
`33`	`33`	`# eval. Not using this indirection would introduce an illegal`
`34`	`34`	`# unicode literal on platforms not supporting such lone`
`@@ -176,7 +176,7 @@ def __init__(self, source):`
`176`	`176`
`177`	`177`	`"""`
`178`	`178`
`179`		`-ifnotutils.supports_lone_surrogates:`
	`179`	`+ifnot_utils.supports_lone_surrogates:`
`180`	`180`	`# Such platforms will have already checked for such`
`181`	`181`	`# surrogate errors, so no need to do this checking.`
`182`	`182`	`self.reportCharacterErrors=None`
`@@ -304,9 +304,9 @@ def characterErrorsUCS2(self, data):`
`304`	`304`	`codepoint=ord(match.group())`
`305`	`305`	`pos=match.start()`
`306`	`306`	`# Pretty sure there should be endianness issues here`
`307`		`-ifutils.isSurrogatePair(data[pos:pos+2]):`
	`307`	`+if_utils.isSurrogatePair(data[pos:pos+2]):`
`308`	`308`	`# We have a surrogate pair!`
`309`		`-char_val=utils.surrogatePairToCodepoint(data[pos:pos+2])`
	`309`	`+char_val=_utils.surrogatePairToCodepoint(data[pos:pos+2])`
`310`	`310`	`ifchar_valinnon_bmp_invalid_codepoints:`
`311`	`311`	`self.errors.append("invalid-codepoint")`
`312`	`312`	`skip=True`

`‎html5lib/tokenizer.pyrenamed to‎html5lib/_tokenizer.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@`
`11`	`11`	`from .constantsimporttokenTypes,tagTokenTypes`
`12`	`12`	`from .constantsimportreplacementCharacters`
`13`	`13`
`14`		`-from .inputstreamimportHTMLInputStream`
	`14`	`+from ._inputstreamimportHTMLInputStream`
`15`	`15`
`16`		`-from .trieimportTrie`
	`16`	`+from ._trieimportTrie`
`17`	`17`
`18`	`18`	`entitiesTrie=Trie(entities)`
`19`	`19`

`‎html5lib/trie/init.pyrenamed to‎html5lib/_trie/init.py`

File renamed without changes.

`‎html5lib/trie/_base.pyrenamed to‎html5lib/_trie/_base.py`

File renamed without changes.

`‎html5lib/trie/datrie.pyrenamed to‎html5lib/_trie/datrie.py`

File renamed without changes.

`‎html5lib/trie/py.pyrenamed to‎html5lib/_trie/py.py`

File renamed without changes.

`‎html5lib/utils.pyrenamed to‎html5lib/_utils.py`

File renamed without changes.

`‎html5lib/filters/alphabeticalattributes.py`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`	`1`	`from __future__importabsolute_import,division,unicode_literals`
`2`	`2`
`3`		`-from .import_base`
	`3`	`+from .importbase`
`4`	`4`
`5`	`5`	`try:`
`6`	`6`	`fromcollectionsimportOrderedDict`
`7`	`7`	`exceptImportError:`
`8`	`8`	`fromordereddictimportOrderedDict`
`9`	`9`
`10`	`10`
`11`		`-classFilter(_base.Filter):`
	`11`	`+classFilter(base.Filter):`
`12`	`12`	`def__iter__(self):`
`13`		`-fortokenin_base.Filter.__iter__(self):`
	`13`	`+fortokeninbase.Filter.__iter__(self):`
`14`	`14`	`iftoken["type"]in ("StartTag","EmptyTag"):`
`15`	`15`	`attrs=OrderedDict()`
`16`	`16`	`forname,valueinsorted(token["data"].items(),`

`‎html5lib/filters/_base.pyrenamed to‎html5lib/filters/base.py`

File renamed without changes.

`‎html5lib/filters/inject_meta_charset.py`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,19 @@`
`1`	`1`	`from __future__importabsolute_import,division,unicode_literals`
`2`	`2`
`3`		`-from .import_base`
	`3`	`+from .importbase`
`4`	`4`
`5`	`5`
`6`		`-classFilter(_base.Filter):`
	`6`	`+classFilter(base.Filter):`
`7`	`7`	`def__init__(self,source,encoding):`
`8`		`-_base.Filter.__init__(self,source)`
	`8`	`+base.Filter.__init__(self,source)`
`9`	`9`	`self.encoding=encoding`
`10`	`10`
`11`	`11`	`def__iter__(self):`
`12`	`12`	`state="pre_head"`
`13`	`13`	`meta_found= (self.encodingisNone)`
`14`	`14`	`pending= []`
`15`	`15`
`16`		`-fortokenin_base.Filter.__iter__(self):`
	`16`	`+fortokeninbase.Filter.__iter__(self):`
`17`	`17`	`type=token["type"]`
`18`	`18`	`iftype=="StartTag":`
`19`	`19`	`iftoken["name"].lower()=="head":`

`‎html5lib/filters/lint.py`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,21 +2,21 @@`
`2`	`2`
`3`	`3`	`fromsiximporttext_type`
`4`	`4`
`5`		`-from .import_base`
	`5`	`+from .importbase`
`6`	`6`	`from ..constantsimportnamespaces,voidElements`
`7`	`7`
`8`	`8`	`from ..constantsimportspaceCharacters`
`9`	`9`	`spaceCharacters="".join(spaceCharacters)`
`10`	`10`
`11`	`11`
`12`		`-classFilter(_base.Filter):`
	`12`	`+classFilter(base.Filter):`
`13`	`13`	`def__init__(self,source,require_matching_tags=True):`
`14`	`14`	`super(Filter,self).__init__(source)`
`15`	`15`	`self.require_matching_tags=require_matching_tags`
`16`	`16`
`17`	`17`	`def__iter__(self):`
`18`	`18`	`open_elements= []`
`19`		`-fortokenin_base.Filter.__iter__(self):`
	`19`	`+fortokeninbase.Filter.__iter__(self):`
`20`	`20`	`type=token["type"]`
`21`	`21`	`iftypein ("StartTag","EmptyTag"):`
`22`	`22`	`namespace=token["namespace"]`

`‎html5lib/filters/optionaltags.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`from __future__importabsolute_import,division,unicode_literals`
`2`	`2`
`3`		`-from .import_base`
	`3`	`+from .importbase`
`4`	`4`
`5`	`5`
`6`		`-classFilter(_base.Filter):`
	`6`	`+classFilter(base.Filter):`
`7`	`7`	`defslider(self):`
`8`	`8`	`previous1=previous2=None`
`9`	`9`	`fortokeninself.source:`

`‎html5lib/filters/sanitizer.py`

Lines changed: 10 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,13 @@`
`5`	`5`
`6`	`6`	`fromsix.movesimporturllib_parseasurlparse`
`7`	`7`
`8`		`-from .import_base`
	`8`	`+from .importbase`
`9`	`9`	`from ..constantsimportnamespaces,prefixes`
`10`	`10`
`11`	`11`	`__all__= ["Filter"]`
`12`	`12`
`13`	`13`
`14`		`-acceptable_elements=frozenset((`
	`14`	`+allowed_elements=frozenset((`
`15`	`15`	`(namespaces['html'],'a'),`
`16`	`16`	`(namespaces['html'],'abbr'),`
`17`	`17`	`(namespaces['html'],'acronym'),`
`@@ -175,7 +175,7 @@`
`175`	`175`	`(namespaces['svg'],'use'),`
`176`	`176`	`))`
`177`	`177`
`178`		`-acceptable_attributes=frozenset((`
	`178`	`+allowed_attributes=frozenset((`
`179`	`179`	`# HTML attributes`
`180`	`180`	`(None,'abbr'),`
`181`	`181`	`(None,'accept'),`
`@@ -552,7 +552,7 @@`
`552`	`552`	`(None,'use')`
`553`	`553`	`))`
`554`	`554`
`555`		`-acceptable_css_properties=frozenset((`
	`555`	`+allowed_css_properties=frozenset((`
`556`	`556`	`'azimuth',`
`557`	`557`	`'background-color',`
`558`	`558`	`'border-bottom-color',`
`@@ -601,7 +601,7 @@`
`601`	`601`	`'width',`
`602`	`602`	`))`
`603`	`603`
`604`		`-acceptable_css_keywords=frozenset((`
	`604`	`+allowed_css_keywords=frozenset((`
`605`	`605`	`'auto',`
`606`	`606`	`'aqua',`
`607`	`607`	`'black',`
`@@ -643,7 +643,7 @@`
`643`	`643`	`'yellow',`
`644`	`644`	`))`
`645`	`645`
`646`		`-acceptable_svg_properties=frozenset((`
	`646`	`+allowed_svg_properties=frozenset((`
`647`	`647`	`'fill',`
`648`	`648`	`'fill-opacity',`
`649`	`649`	`'fill-rule',`
`@@ -654,7 +654,7 @@`
`654`	`654`	`'stroke-opacity',`
`655`	`655`	`))`
`656`	`656`
`657`		`-acceptable_protocols=frozenset((`
	`657`	`+allowed_protocols=frozenset((`
`658`	`658`	`'ed2k',`
`659`	`659`	`'ftp',`
`660`	`660`	`'http',`
`@@ -680,7 +680,7 @@`
`680`	`680`	`'data',`
`681`	`681`	`))`
`682`	`682`
`683`		`-acceptable_content_types=frozenset((`
	`683`	`+allowed_content_types=frozenset((`
`684`	`684`	`'image/png',`
`685`	`685`	`'image/jpeg',`
`686`	`686`	`'image/gif',`
`@@ -689,14 +689,6 @@`
`689`	`689`	`'text/plain',`
`690`	`690`	`))`
`691`	`691`
`692`		`-allowed_elements=acceptable_elements`
`693`		`-allowed_attributes=acceptable_attributes`
`694`		`-allowed_css_properties=acceptable_css_properties`
`695`		`-allowed_css_keywords=acceptable_css_keywords`
`696`		`-allowed_svg_properties=acceptable_svg_properties`
`697`		`-allowed_protocols=acceptable_protocols`
`698`		`-allowed_content_types=acceptable_content_types`
`699`		`-`
`700`	`692`
`701`	`693`	`data_content_type=re.compile(r'''`
`702`	`694`	`^`
`@@ -712,7 +704,7 @@`
`712`	`704`	`re.VERBOSE)`
`713`	`705`
`714`	`706`
`715`		`-classFilter(_base.Filter):`
	`707`	`+classFilter(base.Filter):`
`716`	`708`	`""" sanitization of XHTML+MathML+SVG and of inline style attributes."""`
`717`	`709`	`def__init__(self,`
`718`	`710`	`source,`
`@@ -739,7 +731,7 @@ def __init__(self,`
`739`	`731`	`self.svg_allow_local_href=svg_allow_local_href`
`740`	`732`
`741`	`733`	`def__iter__(self):`
`742`		`-fortokenin_base.Filter.__iter__(self):`
	`734`	`+fortokeninbase.Filter.__iter__(self):`
`743`	`735`	`token=self.sanitize_token(token)`
`744`	`736`	`iftoken:`
`745`	`737`	`yieldtoken`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita8ba43e

File tree

40 files changed

40 files changed

`‎CHANGES.rst`

`‎doc/html5lib.filters.rst`

`‎doc/html5lib.rst`

`‎doc/html5lib.serializer.rst`

`‎doc/html5lib.treebuilders.rst`

`‎doc/html5lib.treewalkers.rst`

`‎html5lib/ihatexml.pyrenamed to‎html5lib/_ihatexml.py`

`‎html5lib/inputstream.pyrenamed to‎html5lib/_inputstream.py`

`‎html5lib/tokenizer.pyrenamed to‎html5lib/_tokenizer.py`

`‎html5lib/trie/init.pyrenamed to‎html5lib/_trie/init.py`

`‎html5lib/trie/_base.pyrenamed to‎html5lib/_trie/_base.py`

`‎html5lib/trie/datrie.pyrenamed to‎html5lib/_trie/datrie.py`

`‎html5lib/trie/py.pyrenamed to‎html5lib/_trie/py.py`

`‎html5lib/utils.pyrenamed to‎html5lib/_utils.py`

`‎html5lib/filters/alphabeticalattributes.py`

`‎html5lib/filters/_base.pyrenamed to‎html5lib/filters/base.py`

`‎html5lib/filters/inject_meta_charset.py`

`‎html5lib/filters/lint.py`

`‎html5lib/filters/optionaltags.py`

`‎html5lib/filters/sanitizer.py`

0 commit comments