Skip to content

Commit 65aa7e9

Browse files
gsneddersgsnedders
committed
Merge branch 'master' into serializer_roundtrip_test
Conflicts: html5lib/tests/test_serializer.py
2 parents 7be95e8 + 84d8a74 commit 65aa7e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1980
-707
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@ stats.prof
1515

1616
# Because tox's data is inherently local
1717
/.tox/
18+
19+
# We have no interest in built Sphinx files
20+
/doc/_build

‎.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "testdata"]
22
path = html5lib/tests/testdata
3-
url = git://github.com/html5lib/html5lib-tests.git
3+
url = https://github.com/html5lib/html5lib-tests.git

‎.travis.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,11 @@ before_install:
2626
- git submodule update --init --recursive
2727

2828
install:
29-
- pip install -r requirements.txt -r requirements-test.txt --use-mirrors
30-
- if [[ $USE_OPTIONAL == "true" ]]; then pip install -r requirements-optional.txt --use-mirrors; fi
31-
- if [[ $TRAVIS_PYTHON_VERSION != "pypy" && $USE_OPTIONAL == "true" ]]; then pip install -r requirements-optional-cpython.txt --use-mirrors; fi
32-
- if [[ $FLAKE == "true" ]]; then pip install --use-mirrors flake8; fi
29+
- bash requirements-install.sh
3330

3431
script:
3532
- nosetests
36-
- if [[ $FLAKE == "true" ]]; then find html5lib/ -name '*.py' -and -not -name 'constants.py' -print0 | xargs -0 flake8 --ignore=E501; fi
37-
- if [[ $FLAKE == "true" ]]; then flake8 --max-line-length=99 --ignore=E126 html5lib/constants.py; fi
33+
- bash flake8-run.sh
3834

3935
after_script:
4036
- python debug-info.py

‎AUTHORS.rst

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
Credits
2+
=======
3+
4+
``html5lib`` is written and maintained by:
5+
6+
- James Graham
7+
- Geoffrey Sneddon
8+
- Łukasz Langa
9+
10+
11+
Patches and suggestions
12+
-----------------------
13+
14+
- Anne van Kesteren
15+
- Lachlan Hunt
16+
- lantis63
17+
- Sam Ruby
18+
- Tim Fletcher
19+
- Thomas Broyer
20+
- Mark Pilgrim
21+
- Philip Taylor
22+
- Ryan King
23+
- Edward Z. Yang
24+
- Philip Jägenstedt
25+
- Ms2ger
26+
- Andy Wingo
27+
- Andreas Madsack
28+
- Karim Valiev
29+
- Mohammad Taha Jahangir
30+
- Juan Carlos Garcia Segovia

‎CHANGES.rst

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
Change Log
2+
----------
3+
4+
1.0b2
5+
~~~~~
6+
7+
Released on XXX, 2013
8+
9+
* Removed ``dom2sax`` from DOM treebuilders. It has been replaced by
10+
``treeadapters.sax.to_sax`` which is generic and supports any
11+
treewalker; it also resolves all known bugs with ``dom2sax``.
12+
13+
14+
1.0b1
15+
~~~~~
16+
17+
Released on May 17, 2013
18+
19+
* Implementation updated to implement the `HTML specification
20+
<http://www.whatwg.org/specs/web-apps/current-work/>`_ as of 5th May
21+
2013 (`SVN <http://svn.whatwg.org/webapps/>`_ revision r7867).
22+
23+
* Python 3.2+ supported in a single codebase using the ``six`` library.
24+
25+
* Removed support for Python 2.5 and older.
26+
27+
* Removed the deprecated Beautiful Soup 3 treebuilder.
28+
``beautifulsoup4`` can use ``html5lib`` as a parser instead. Note that
29+
since it doesn't support namespaces, foreign content like SVG and
30+
MathML is parsed incorrectly.
31+
32+
* Removed ``simpletree`` from the package. The default tree builder is
33+
now ``etree`` (using the ``xml.etree.cElementTree`` implementation if
34+
available, and ``xml.etree.ElementTree`` otherwise).
35+
36+
* Removed the ``XHTMLSerializer`` as it never actually guaranteed its
37+
output was well-formed XML, and hence provided little of use.
38+
39+
* Removed default DOM treebuilder, so ``html5lib.treebuilders.dom`` is no
40+
longer supported. ``html5lib.treebuilders.getTreeBuilder("dom")`` will
41+
return the default DOM treebuilder, which uses ``xml.dom.minidom``.
42+
43+
* Optional heuristic character encoding detection now based on
44+
``charade`` for Python 2.6 - 3.3 compatibility.
45+
46+
* Optional ``Genshi`` treewalker support fixed.
47+
48+
* Many bugfixes, including:
49+
50+
* #33: null in attribute value breaks XML AttValue;
51+
52+
* #4: nested, indirect descendant, <button> causes infinite loop;
53+
54+
* `Google Code 215
55+
<http://code.google.com/p/html5lib/issues/detail?id=215>`_: Properly
56+
detect seekable streams;
57+
58+
* `Google Code 206
59+
<http://code.google.com/p/html5lib/issues/detail?id=206>`_: add
60+
support for <video preload=...>, <audio preload=...>;
61+
62+
* `Google Code 205
63+
<http://code.google.com/p/html5lib/issues/detail?id=205>`_: add
64+
support for <video poster=...>;
65+
66+
* `Google Code 202
67+
<http://code.google.com/p/html5lib/issues/detail?id=202>`_: Unicode
68+
file breaks InputStream.
69+
70+
* Source code is now mostly PEP 8 compliant.
71+
72+
* Test harness has been improved and now depends on ``nose``.
73+
74+
* Documentation updated and moved to http://html5lib.readthedocs.org/.
75+
76+
77+
0.95
78+
~~~~
79+
80+
Released on February 11, 2012
81+
82+
83+
0.90
84+
~~~~
85+
86+
Released on January 17, 2010
87+
88+
89+
0.11.1
90+
~~~~~~
91+
92+
Released on June 12, 2008
93+
94+
95+
0.11
96+
~~~~
97+
98+
Released on June 10, 2008
99+
100+
101+
0.10
102+
~~~~
103+
104+
Released on October 7, 2007
105+
106+
107+
0.9
108+
~~~
109+
110+
Released on March 11, 2007
111+
112+
113+
0.2
114+
~~~
115+
116+
Released on January 8, 2007

‎CONTRIBUTING.rst

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
Contributing
2+
============
3+
4+
Pull requests are more than welcome — both to the library and to the
5+
documentation. Some useful information:
6+
7+
- We aim to follow PEP 8 in the library, but ignoring the
8+
79-character-per-line limit, instead following a soft limit of 99,
9+
but allowing lines over this where it is the readable thing to do.
10+
11+
- We aim to follow PEP 257 for all docstrings, and make them properly
12+
parseable by Sphinx while generating API documentation.
13+
14+
- We keep ``pyflakes`` reporting no errors or warnings at all times.
15+
16+
- We keep the master branch passing all tests at all times on all
17+
supported versions.
18+
19+
`Travis CI <https://travis-ci.org/html5lib/html5lib-python/>`_ is run
20+
against all pull requests and should enforce all of the above.
21+
22+
We use `Opera Critic <https://critic.hoppipolla.co.uk/>`_ as an external
23+
code-review tool, which uses your GitHub login to authenticate. You'll
24+
get email notifications for issues raised in the review.
25+
26+
27+
Patch submission guidelines
28+
---------------------------
29+
30+
- **Create a new Git branch specific to your change.** Do not put
31+
multiple fixes/features in the same pull request. If you find an
32+
unrelated bug, create a distinct branch and submit a separate pull
33+
request for the bugfix. This makes life much easier for maintainers
34+
and will speed up merging your patches.
35+
36+
- **Write a test** whenever possible. Following existing tests is often
37+
easiest, and a good way to tell whether the feature you're modifying
38+
is easily testable.
39+
40+
- **Make sure documentation is updated.** Keep docstrings current, and
41+
if necessary, update the Sphinx documentation in ``doc/``.
42+
43+
- **Add a changelog entry** at the top of ``CHANGES.rst`` following
44+
existing entries' styles.
45+
46+
- **Run tests with tox** if possible, to make sure your changes are
47+
compatible with all supported Python versions.
48+
49+
- **Squash commits** before submitting the pull request so that a single
50+
commit contains the entire change, and only that change (see the first
51+
bullet).
52+
53+
- **Don't rebase after creating the pull request.** Merge with upstream,
54+
if necessary, and use ``git commit --fixup`` for fixing issues raised
55+
in a Critic review or by a failing Travis build. The reviewer will
56+
squash and rebase your pull request while accepting it. Even though
57+
GitHub won't recognize the pull request as accepted, the squashed
58+
commits will properly specify you as the author.
59+
60+
- **Attribute yourself** in ``AUTHORS.rst``.

‎MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
include LICENSE
2+
include CHANGES.rst
23
include README.rst
34
include requirements*.txt
45
graft html5lib/tests/testdata

0 commit comments

Comments
 (0)