From cbad970faca89cf88ab116180e26bbcfab42f268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
Date: Tue, 7 May 2013 23:04:54 +0200
Subject: [PATCH 1/6] pulled all 0.95 - 1.0 changes from git logs

---
 CHANGES.rst | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index eb39c1c1..bea688a0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,10 +6,60 @@ Change Log
 
 Released on XXX, 2013
 
+* Python 3.2+ supported in a single codebase using the ``six`` library.
+
+* Removed support for Python 2.5 and older.
+
+* Removed the deprecated Beautiful Soup 3 treebuilder.
+  ``beautifulsoup4`` can use ``html5lib`` as a parser instead.
+
 * Removed ``simpletree`` from the package. The default tree builder is
   now ``etree`` (using the ``xml.etree.ElementTree/cElementTree``
   implementation).
 
+* Removed the ``XHTMLSerializer`` which never actually guaranteed its
+  output was well-formed XML, and hence provided little of use.
+
+* Optional heuristic character encoding detection now based on
+  ``charade`` for Python 2.6 - 3.3 compatibility.
+
+* Optional ``Genshi`` treewalker support fixed.
+
+* Implementation of the `adoption agency algorithm
+  <http://www.whatwg.org/specs/web-apps/current-work/#adoptionAgency>`_
+  updated to `SVN <http://svn.whatwg.org/webapps/>`_ revision r7867.
+
+* Removed the "seeding a form with initial values" algorithm
+  implementation as it was removed from the spec.
+
+* ``<main>`` tag supported.
+
+* Many bugfixes, including:
+
+  * #33: null in attribute value breaks XML AttValue;
+
+  * #4: nested, indirect descendant, <button> causes infinite loop;
+
+  * `Google Code 215
+    <http://code.google.com/p/html5lib/issues/detail?id=215>`_: Properly
+    detect seekable streams;
+
+  * `Google Code 206
+    <http://code.google.com/p/html5lib/issues/detail?id=206`_: add
+    support for <video preload=...>, <audio preload=...>;
+
+  * `Google Code 205
+    <http://code.google.com/p/html5lib/issues/detail?id=205>`_: add
+    support for <video poster=...>;
+
+  * `Google Code 202
+    <http://code.google.com/p/html5lib/issues/detail?id=202>`_: Unicode
+    file breaks InputStream.
+
+* Source code is now mostly PEP8 compliant.
+
+* Test harness has been improved and now depends on ``nose``.
+
 
 0.95
 ~~~~

From 381c371cc89ac5ec3809c5f759be3650910cc0c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
Date: Wed, 8 May 2013 02:11:03 +0200
Subject: [PATCH 2/6] fixup! pulled all 0.95 - 1.0 changes from git logs

---
 CHANGES.rst | 25 +++++++++++--------------
 README.rst  |  4 ++--
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index bea688a0..094ac2a4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,18 +6,24 @@ Change Log
 
 Released on XXX, 2013
 
+* Implementation updated to implement the `HTML specification
+  <http://www.whatwg.org/specs/web-apps/current-work/>`_ as of 5th May
+  2013 (`SVN <http://svn.whatwg.org/webapps/>`_ revision r7867).
+
 * Python 3.2+ supported in a single codebase using the ``six`` library.
 
 * Removed support for Python 2.5 and older.
 
 * Removed the deprecated Beautiful Soup 3 treebuilder.
-  ``beautifulsoup4`` can use ``html5lib`` as a parser instead.
+  ``beautifulsoup4`` can use ``html5lib`` as a parser instead. Note that
+  since it doesn't support namespaces, foreign content like SVG and
+  MathML is parsed incorrectly.
 
 * Removed ``simpletree`` from the package. The default tree builder is
-  now ``etree`` (using the ``xml.etree.ElementTree/cElementTree``
-  implementation).
+  now ``etree`` (using the ``xml.etree.cElementTree`` implementation if
+  available, and ``xml.etree.ElementTree`` otherwise).
 
-* Removed the ``XHTMLSerializer`` which never actually guaranteed its
+* Removed the ``XHTMLSerializer`` as it never actually guaranteed its
   output was well-formed XML, and hence provided little of use.
 
 * Optional heuristic character encoding detection now based on
@@ -25,15 +31,6 @@ Released on XXX, 2013
 
 * Optional ``Genshi`` treewalker support fixed.
 
-* Implementation of the `adoption agency algorithm
-  <http://www.whatwg.org/specs/web-apps/current-work/#adoptionAgency>`_
-  updated to `SVN <http://svn.whatwg.org/webapps/>`_ revision r7867.
-
-* Removed the "seeding a form with initial values" algorithm
-  implementation as it was removed from the spec.
-
-* ``<main>`` tag supported.
-
 * Many bugfixes, including:
 
   * #33: null in attribute value breaks XML AttValue;
@@ -56,7 +53,7 @@ Released on XXX, 2013
     <http://code.google.com/p/html5lib/issues/detail?id=202>`_: Unicode
     file breaks InputStream.
 
-* Source code is now mostly PEP8 compliant.
+* Source code is now mostly PEP 8 compliant.
 
 * Test harness has been improved and now depends on ``nose``.
 
diff --git a/README.rst b/README.rst
index f38b9426..95d9a384 100644
--- a/README.rst
+++ b/README.rst
@@ -9,7 +9,7 @@ web browsers.
 Requirements
 ------------
 
-Python 2.6 and above as well as Python 3.0 and above are
+Python 2.6 and above as well as Python 3.2 and above are
 supported. Implementations known to work are CPython (as the reference
 implementation) and PyPy. Jython is known *not* to work due to various
 bugs in its implementation of the language. Others such as IronPython
@@ -17,7 +17,7 @@ may or may not work; if you wish to try, you are strongly encouraged
 to run the testsuite and report back!
 
 The only required library dependency is ``six``, this can be found
-packaged in PyPI.
+packaged on PyPI.
 
 Optionally:
 

From 7e6b563553d50a41cad0bfd2c7c236d7dc0017ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
Date: Wed, 8 May 2013 02:56:09 +0200
Subject: [PATCH 3/6] fixup! pulled all 0.95 - 1.0 changes from git logs

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 094ac2a4..fc867731 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -42,7 +42,7 @@ Released on XXX, 2013
     detect seekable streams;
 
   * `Google Code 206
-    <http://code.google.com/p/html5lib/issues/detail?id=206`_: add
+    <http://code.google.com/p/html5lib/issues/detail?id=206>`_: add
     support for <video preload=...>, <audio preload=...>;
 
   * `Google Code 205

From e689325cc036df1f1829dded3767ca14587347dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
Date: Wed, 8 May 2013 14:51:12 +0200
Subject: [PATCH 4/6] fixup! pulled all 0.95 - 1.0 changes from git logs

---
 README.rst | 126 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 74 insertions(+), 52 deletions(-)

diff --git a/README.rst b/README.rst
index 95d9a384..4e5352d0 100644
--- a/README.rst
+++ b/README.rst
@@ -1,63 +1,91 @@
 html5lib
 ========
 
+.. image:: https://travis-ci.org/html5lib/html5lib-python.png?branch=master
+  :target: https://travis-ci.org/html5lib/html5lib-python
+
 html5lib is a pure-python library for parsing HTML. It is designed to
 conform to the WHATWG HTML specification, as is implemented by all major
 web browsers.
 
 
-Requirements
-------------
+Usage
+-----
 
-Python 2.6 and above as well as Python 3.2 and above are
-supported. Implementations known to work are CPython (as the reference
-implementation) and PyPy. Jython is known *not* to work due to various
-bugs in its implementation of the language. Others such as IronPython
-may or may not work; if you wish to try, you are strongly encouraged
-to run the testsuite and report back!
+Simple usage follows this pattern:
 
-The only required library dependency is ``six``, this can be found
-packaged on PyPI.
+.. code-block:: python
 
-Optionally:
+  import html5lib
+  with open("mydocument.html", "r") as f:
+      document = html5lib.parse(f)
 
-- ``datrie`` can be used to improve parsing performance (though in
-  almost all cases the improvement is marginal);
+or:
 
-- ``lxml`` is supported as a tree format (for both building and
-  walking) under CPython (but *not* PyPy where it is known to cause
-  segfaults);
+.. code-block:: python
 
-- ``genshi`` has a treewalker (but not builder); and
+  import html5lib
+  document = html5lib.parse("<p>Hello World!")
 
-- ``charade`` can be used as a fallback when character encoding cannot
-  be determined; ``chardet``, from which it was forked, can also be used
-  on Python 2.
+To have more control over the parser, create a parser object explicitly:
+
+.. code-block:: python
+
+  import html5lib
+  with open("mydocument.html", "r") as f:
+      parser = html5lib.HTMLParser(strict=True)
+      document = parser.parse(f)
+
+By default, the ``document`` will be an ``xml.etree.ElementTree``
+object. To use an alternative format, specify the name of a treebuilder:
+
+.. code-block:: python
+
+  import html5lib
+  with open("mydocument.html", "r") as f:
+      lxml_etree_document = html5lib.parse(f, treebuilder="lxml")
+
+When you're instantiating parser objects explicitly, pass a treebuilder
+class as the ``tree`` keyword argument:
+
+.. code-block:: python
+
+  import html5lib
+  parser = html5lib.HTMLParser(tree=html5lib.getTreeBuilder("dom"))
+  minidom_document = parser.parse("<p>Hello World!")
+
+More documentation is available at http://html5lib.readthedocs.org/. 
 
 
 Installation
 ------------
 
-html5lib is packaged with distutils. To install it use::
+html5lib works on CPython 2.6+, CPython 3.2+ and PyPy.  To install it,
+use:
 
-  $ python setup.py install
+.. code-block:: bash
 
+    $ pip install html5lib
 
-Usage
------
 
-Simple usage follows this pattern::
+Optional Dependencies
+---------------------
 
-  import html5lib
-  with open("mydocument.html", "r") as fp:
-      document = html5lib.parse(f)
+The following third-party libraries might be used for additional
+functionality:
 
-or::
+- ``datrie`` can be used to improve parsing performance (though in
+  almost all cases the improvement is marginal);
 
-  import html5lib
-  document = html5lib.parse("<p>Hello World!")
+- ``lxml`` is supported as a tree format (for both building and
+  walking) under CPython (but *not* PyPy where it is known to cause
+  segfaults);
+
+- ``genshi`` has a treewalker (but not builder); and
 
-More documentation is available in the docstrings.
+- ``charade`` can be used as a fallback when character encoding cannot
+  be determined; ``chardet``, from which it was forked, can also be used
+  on Python 2.
 
 
 Bugs
@@ -70,28 +98,21 @@ Please report any bugs on the `issue tracker
 Tests
 -----
 
-These are contained in the html5lib-tests repository and included as a
-submodule, thus for git checkouts they must be initialized (for
-release tarballs this is unneeded)::
+Unit tests require the ``nose`` library and can be run using the
+``nosetests`` command in the root directory. All should pass.
 
-  $ git submodule init
-  $ git submodule update
+Test data are contained in a separate `html5lib-tests
+<https://github.com/html5lib/html5lib-tests>`_ repository and included
+as a submodule, thus for git checkouts they must be initialized::
 
-And then they can be run, with ``nose`` installed, using the
-``nosetests`` command in the root directory. All should pass.
+  $ git submodule init
+  $ git submodule update 
+  
+This is unneeded for release tarballs.
 
 If you have all compatible Python implementations available on your
-system, you can run tests on all of them by using tox::
-
-  $ pip install tox
-  $ tox
-  ...
-  _______________________ summary ______________________
-    py26: commands succeeded
-    py27: commands succeeded
-    py32: commands succeeded
-    py33: commands succeeded
-    congratulations :)
+system, you can run tests on all of them using the ``tox`` utility,
+which can be found on PyPI.
 
 
 Contributing
@@ -121,5 +142,6 @@ Questions?
 
 There's a mailing list available for support on Google Groups,
 `html5lib-discuss <http://groups.google.com/group/html5lib-discuss>`_,
-though you may have more success (and get a far quicker response)
-asking on IRC in #whatwg on irc.freenode.net.
+though you may get a quicker response asking on IRC in #whatwg on
+irc.freenode.net.
+

From f390fb4aa1c72ab07d9e6f7ef8654e0963dbba5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
Date: Wed, 8 May 2013 16:15:11 +0200
Subject: [PATCH 5/6] fixup! pulled all 0.95 - 1.0 changes from git logs

---
 README.rst | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/README.rst b/README.rst
index 4e5352d0..91bebf22 100644
--- a/README.rst
+++ b/README.rst
@@ -17,7 +17,7 @@ Simple usage follows this pattern:
 .. code-block:: python
 
   import html5lib
-  with open("mydocument.html", "r") as f:
+  with open("mydocument.html", "rb") as f:
       document = html5lib.parse(f)
 
 or:
@@ -27,26 +27,34 @@ or:
   import html5lib
   document = html5lib.parse("<p>Hello World!")
 
-To have more control over the parser, create a parser object explicitly:
+By default, the ``document`` will be an ``xml.etree`` element instance.
+Whenever possible, html5lib chooses the accelerated ``ElementTree``
+implementation (available as ``xml.etree.cElementTree`` on Python
+2.x).
+
+Two other tree types are supported: ``xml.dom.minidom`` and
+``lxml.etree``. To use an alternative format, specify the name of
+a treebuilder:
 
 .. code-block:: python
 
   import html5lib
-  with open("mydocument.html", "r") as f:
-      parser = html5lib.HTMLParser(strict=True)
-      document = parser.parse(f)
+  with open("mydocument.html", "rb") as f:
+      lxml_etree_document = html5lib.parse(f, treebuilder="lxml")
 
-By default, the ``document`` will be an ``xml.etree.ElementTree``
-object. To use an alternative format, specify the name of a treebuilder:
+To have more control over the parser, create a parser object explicitly.
+For instance, to make the parser raise exceptions on parse errors, use:
 
 .. code-block:: python
 
   import html5lib
-  with open("mydocument.html", "r") as f:
-      lxml_etree_document = html5lib.parse(f, treebuilder="lxml")
+  with open("mydocument.html", "rb") as f:
+      parser = html5lib.HTMLParser(strict=True)
+      document = parser.parse(f)
 
 When you're instantiating parser objects explicitly, pass a treebuilder
-class as the ``tree`` keyword argument:
+class as the ``tree`` keyword argument to use an alternative document
+format:
 
 .. code-block:: python
 
@@ -54,7 +62,7 @@ class as the ``tree`` keyword argument:
   parser = html5lib.HTMLParser(tree=html5lib.getTreeBuilder("dom"))
   minidom_document = parser.parse("<p>Hello World!")
 
-More documentation is available at http://html5lib.readthedocs.org/. 
+More documentation is available at http://html5lib.readthedocs.org/.
 
 
 Installation
@@ -71,7 +79,7 @@ use:
 Optional Dependencies
 ---------------------
 
-The following third-party libraries might be used for additional
+The following third-party libraries may be used for additional
 functionality:
 
 - ``datrie`` can be used to improve parsing performance (though in
@@ -106,8 +114,8 @@ Test data are contained in a separate `html5lib-tests
 as a submodule, thus for git checkouts they must be initialized::
 
   $ git submodule init
-  $ git submodule update 
-  
+  $ git submodule update
+
 This is unneeded for release tarballs.
 
 If you have all compatible Python implementations available on your
@@ -144,4 +152,3 @@ There's a mailing list available for support on Google Groups,
 `html5lib-discuss <http://groups.google.com/group/html5lib-discuss>`_,
 though you may get a quicker response asking on IRC in #whatwg on
 irc.freenode.net.
-

From 51ff1744ad8ccaf37d36edbd8d497e86d137ddb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
Date: Wed, 8 May 2013 19:26:33 +0200
Subject: [PATCH 6/6] fixup! pulled all 0.95 - 1.0 changes from git logs

---
 README.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 91bebf22..af4c1fe8 100644
--- a/README.rst
+++ b/README.rst
@@ -29,8 +29,7 @@ or:
 
 By default, the ``document`` will be an ``xml.etree`` element instance.
 Whenever possible, html5lib chooses the accelerated ``ElementTree``
-implementation (available as ``xml.etree.cElementTree`` on Python
-2.x).
+implementation (i.e. ``xml.etree.cElementTree`` on Python 2.x).
 
 Two other tree types are supported: ``xml.dom.minidom`` and
 ``lxml.etree``. To use an alternative format, specify the name of