[Python-modules-commits] [html5lib] 03/04: merge patched into master

Barry Warsaw barry at moszumanska.debian.org
Mon Oct 31 20:25:42 UTC 2016


This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository html5lib.

commit 1f9a60006be61b045e133b1fa41bd2cc63205f15
Merge: b2f5b8b a7d4397
Author: Barry Warsaw <barry at python.org>
Date:   Mon Oct 31 15:58:05 2016 -0400

    merge patched into master

 .pytest.expect                                     |  1322 +
 AUTHORS.rst                                        |    44 +
 CHANGES.rst                                        |   130 +-
 MANIFEST.in                                        |    10 +
 PKG-INFO                                           |   164 +-
 README.rst                                         |    27 +-
 debian/.git-dpm                                    |     6 +-
 debian/patches/series                              |     1 -
 debian/patches/setuptools.patch                    |    23 -
 PKG-INFO => html5lib.egg-info/PKG-INFO             |   164 +-
 html5lib.egg-info/SOURCES.txt                      |   153 +
 html5lib.egg-info/dependency_links.txt             |     1 +
 html5lib.egg-info/requires.txt                     |    26 +
 html5lib.egg-info/top_level.txt                    |     1 +
 html5lib/__init__.py                               |     4 +-
 html5lib/{ihatexml.py => _ihatexml.py}             |    13 +-
 html5lib/{inputstream.py => _inputstream.py}       |   227 +-
 html5lib/{tokenizer.py => _tokenizer.py}           |    36 +-
 html5lib/{trie => _trie}/__init__.py               |     2 +
 html5lib/{trie => _trie}/_base.py                  |     3 +-
 html5lib/{trie => _trie}/datrie.py                 |     0
 html5lib/{trie => _trie}/py.py                     |     0
 html5lib/{utils.py => _utils.py}                   |    59 +-
 html5lib/constants.py                              |   691 +-
 html5lib/filters/alphabeticalattributes.py         |     6 +-
 html5lib/filters/{_base.py => base.py}             |     0
 html5lib/filters/inject_meta_charset.py            |     8 +-
 html5lib/filters/lint.py                           |   112 +-
 html5lib/filters/optionaltags.py                   |    11 +-
 html5lib/filters/sanitizer.py                      |   861 +-
 html5lib/filters/whitespace.py                     |     6 +-
 html5lib/html5parser.py                            |   570 +-
 html5lib/sanitizer.py                              |   271 -
 .../htmlserializer.py => serializer.py}            |   194 +-
 html5lib/serializer/__init__.py                    |    16 -
 html5lib/tests/conftest.py                         |    86 +
 html5lib/tests/mockParser.py                       |    41 -
 html5lib/tests/performance/concatenation.py        |    36 -
 html5lib/tests/sanitizer.py                        |    50 +
 html5lib/tests/support.py                          |    77 +-
 html5lib/tests/test_encoding.py                    |   120 +-
 html5lib/tests/test_meta.py                        |    41 +
 html5lib/tests/test_optionaltags_filter.py         |     7 +
 html5lib/tests/test_parser.py                      |    96 -
 html5lib/tests/test_parser2.py                     |   180 +-
 html5lib/tests/test_sanitizer.py                   |   148 +-
 html5lib/tests/test_serializer.py                  |   177 +-
 html5lib/tests/test_stream.py                      |   480 +-
 html5lib/tests/test_tokenizer.py                   |   188 -
 html5lib/tests/test_treeadapters.py                |     4 +-
 html5lib/tests/test_treewalkers.py                 |   353 +-
 html5lib/tests/test_whitespace_filter.py           |   246 +-
 html5lib/tests/testdata/.gitattributes             |     2 +
 html5lib/tests/testdata/AUTHORS.rst                |    34 +
 html5lib/tests/testdata/LICENSE                    |    21 +
 html5lib/tests/testdata/encoding/test-yahoo-jp.dat |     2 +-
 html5lib/tests/testdata/encoding/tests1.dat        |    72 +-
 html5lib/tests/testdata/encoding/tests2.dat        |    10 +-
 html5lib/tests/testdata/sanitizer/tests1.dat       |   501 -
 html5lib/tests/testdata/sites/google-results.htm   |     1 -
 .../tests/testdata/sites/python-ref-import.htm     |     1 -
 html5lib/tests/testdata/sites/web-apps-old.htm     |     1 -
 html5lib/tests/testdata/sites/web-apps.htm         | 34275 -------------------
 html5lib/tests/testdata/sniffer/htmlOrFeed.json    |    43 -
 html5lib/tests/testdata/tokenizer/README.md        |   104 +
 .../testdata/tokenizer/contentModelFlags.test      |     6 +
 html5lib/tests/testdata/tokenizer/domjs.test       |    12 +-
 html5lib/tests/testdata/tokenizer/entities.test    |     4 +-
 .../tests/testdata/tokenizer/namedEntities.test    |  1979 --
 .../tests/testdata/tokenizer/numericEntities.test  |    36 +
 html5lib/tests/testdata/tokenizer/test1.test       |    12 +-
 html5lib/tests/testdata/tokenizer/test2.test       |     4 +-
 html5lib/tests/testdata/tokenizer/test3.test       |    26 +-
 html5lib/tests/testdata/tokenizer/test4.test       |    14 +-
 .../tokenizer/unicodeCharsProblematic.test         |    12 +-
 .../tests/testdata/tree-construction/README.md     |   104 +
 .../testdata/tree-construction/adoption01.dat      |    79 +
 .../testdata/tree-construction/adoption02.dat      |     8 +
 .../testdata/tree-construction/comments01.dat      |    32 +
 .../tests/testdata/tree-construction/doctype01.dat |    54 +
 .../testdata/tree-construction/domjs-unsafe.dat    |   Bin 6639 -> 9884 bytes
 .../testdata/tree-construction/entities01.dat      |   192 +
 .../testdata/tree-construction/entities02.dat      |    44 +
 .../tree-construction/foreign-fragment.dat         |   549 +
 .../testdata/tree-construction/html5test-com.dat   |    45 +
 .../tests/testdata/tree-construction/inbody01.dat  |    11 +
 .../tests/testdata/tree-construction/isindex.dat   |    39 +-
 .../testdata/tree-construction/main-element.dat    |    21 +-
 html5lib/tests/testdata/tree-construction/math.dat |    81 +
 .../tree-construction/menuitem-element.dat         |   229 +
 .../tree-construction/namespace-sensitivity.dat    |    16 +
 .../testdata/tree-construction/noscript01.dat      |   237 +
 .../pending-spec-changes-plain-text-unsafe.dat     |   Bin 115 -> 816 bytes
 .../tree-construction/pending-spec-changes.dat     |    24 +-
 .../tree-construction/plain-text-unsafe.dat        |   Bin 4166 -> 7925 bytes
 html5lib/tests/testdata/tree-construction/ruby.dat |   301 +
 .../testdata/tree-construction/scriptdata01.dat    |    57 +
 .../tests/testdata/tree-construction/tables01.dat  |    74 +
 .../tests/testdata/tree-construction/template.dat  |   349 +-
 .../tests/testdata/tree-construction/tests1.dat    |  1005 +-
 .../tests/testdata/tree-construction/tests10.dat   |   186 +-
 .../tests/testdata/tree-construction/tests11.dat   |    81 +-
 .../tests/testdata/tree-construction/tests14.dat   |     5 +-
 .../tests/testdata/tree-construction/tests15.dat   |    62 +-
 .../tests/testdata/tree-construction/tests16.dat   |   649 +-
 .../tests/testdata/tree-construction/tests17.dat   |    26 +
 .../tests/testdata/tree-construction/tests18.dat   |    81 +-
 .../tests/testdata/tree-construction/tests19.dat   |   323 +-
 .../tests/testdata/tree-construction/tests2.dat    |   217 +-
 .../tests/testdata/tree-construction/tests20.dat   |   127 +
 .../tests/testdata/tree-construction/tests21.dat   |    54 +-
 .../tests/testdata/tree-construction/tests22.dat   |    39 +-
 .../tests/testdata/tree-construction/tests23.dat   |    19 +-
 .../tests/testdata/tree-construction/tests25.dat   |     8 +-
 .../tests/testdata/tree-construction/tests26.dat   |   115 +-
 .../tests/testdata/tree-construction/tests3.dat    |    44 +-
 .../tests/testdata/tree-construction/tests4.dat    |     1 -
 .../tests/testdata/tree-construction/tests5.dat    |    55 +-
 .../tests/testdata/tree-construction/tests6.dat    |   314 +-
 .../tests/testdata/tree-construction/tests7.dat    |    86 +-
 .../tests/testdata/tree-construction/tests8.dat    |    69 +-
 .../tests/testdata/tree-construction/tests9.dat    |   149 +-
 .../tree-construction/tests_innerHTML_1.dat        |   146 +
 .../tests/testdata/tree-construction/tricky01.dat  |    75 +
 .../tests/testdata/tree-construction/webkit01.dat  |   128 +-
 .../tests/testdata/tree-construction/webkit02.dat  |   207 +
 html5lib/tests/testdata/validator/attributes.test  |  1035 -
 .../testdata/validator/base-href-attribute.test    |   787 -
 .../testdata/validator/base-target-attribute.test  |    35 -
 .../validator/blockquote-cite-attribute.test       |     7 -
 .../tests/testdata/validator/classattribute.test   |   152 -
 .../validator/contenteditableattribute.test        |    59 -
 .../testdata/validator/contextmenuattribute.test   |   115 -
 .../tests/testdata/validator/dirattribute.test     |    59 -
 .../testdata/validator/draggableattribute.test     |    63 -
 .../testdata/validator/html-xmlns-attribute.test   |    23 -
 html5lib/tests/testdata/validator/idattribute.test |   115 -
 .../tests/testdata/validator/inputattributes.test  |  2795 --
 .../testdata/validator/irrelevantattribute.test    |    63 -
 .../tests/testdata/validator/langattribute.test    |  5579 ---
 .../testdata/validator/li-value-attribute.test     |     7 -
 .../testdata/validator/link-href-attribute.test    |     7 -
 .../validator/link-hreflang-attribute.test         |     7 -
 .../testdata/validator/link-rel-attribute.test     |   271 -
 .../testdata/validator/ol-start-attribute.test     |     7 -
 html5lib/tests/testdata/validator/starttags.test   |   375 -
 .../testdata/validator/style-scoped-attribute.test |     7 -
 .../testdata/validator/tabindexattribute.test      |    79 -
 html5lib/tests/tokenizer.py                        |   252 +
 html5lib/tests/tree_construction.py                |   204 +
 html5lib/treeadapters/__init__.py                  |    12 +
 html5lib/treeadapters/genshi.py                    |    47 +
 html5lib/treebuilders/__init__.py                  |     2 +-
 html5lib/treebuilders/{_base.py => base.py}        |    14 +-
 html5lib/treebuilders/dom.py                       |    51 +-
 html5lib/treebuilders/etree.py                     |    21 +-
 html5lib/treebuilders/etree_lxml.py                |    42 +-
 html5lib/treewalkers/__init__.py                   |   132 +-
 html5lib/treewalkers/{_base.py => base.py}         |    94 +-
 html5lib/treewalkers/dom.py                        |    19 +-
 html5lib/treewalkers/etree.py                      |    25 +-
 .../treewalkers/{lxmletree.py => etree_lxml.py}    |    69 +-
 .../treewalkers/{genshistream.py => genshi.py}     |    12 +-
 html5lib/treewalkers/pulldom.py                    |    63 -
 pytest.ini                                         |    17 +
 requirements-optional-2.6.txt                      |     5 -
 requirements-optional-cpython.txt                  |     5 -
 requirements-optional.txt                          |    14 +-
 requirements-test.txt                              |     6 +-
 requirements.txt                                   |     3 +
 setup.cfg                                          |    17 +
 setup.py                                           |    74 +-
 tox.ini                                            |    17 +
 173 files changed, 11500 insertions(+), 52845 deletions(-)

diff --cc debian/.git-dpm
index 91324d3,0000000..601a81e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 53f17c16e40fee8a9b671fd88373a2de9887f978
- 53f17c16e40fee8a9b671fd88373a2de9887f978
- 09ac6c185e70d7241b00961b630261e54d5559ed
++a7d4397597d76c71dd9d232522bad124f0dd68a3
++a7d4397597d76c71dd9d232522bad124f0dd68a3
++a7d4397597d76c71dd9d232522bad124f0dd68a3
 +a7d4397597d76c71dd9d232522bad124f0dd68a3
 +html5lib_0.999999999.orig.tar.gz
 +814e7ab8d865c3c0ba96a13fe383c06735329c36
 +245488
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/html5lib.git



More information about the Python-modules-commits mailing list