11 changed files with 717 additions and 1846 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -4,72 +4,3 @@ lxml-2.2.7.tar.gz.asc
 /lxml-2.2.8.tar.gz.asc
 /lxml-2.3.tar.gz
 /lxml-2.3.tar.gz.asc
-/lxml-2.3.1.tar.gz
-/lxml-2.3.1.tar.gz.asc
-/lxml-2.3.2.tar.gz
-/lxml-2.3.2.tar.gz.asc
-/lxml-2.3.3.tar.gz
-/lxml-2.3.3.tar.gz.asc
-/lxml-2.3.5.tar.gz
-/lxml-2.3.5.tar.gz.asc
-/lxml-3.0.tar.gz
-/lxml-3.0.tar.gz.asc
-/lxml-3.0.tgz
-/lxml-3.0.tgz.asc
-/lxml-3.0.1.tgz
-/lxml-3.0.1.tgz.asc
-/lxml-3.1.0.tgz
-/lxml-3.1.0.tgz.asc
-/lxml-3.2.0.tgz
-/lxml-3.2.0.tgz.asc
-/lxml-3.2.1.tgz
-/lxml-3.2.1.tgz.asc
-/lxml-3.2.3.tgz
-/lxml-3.2.3.tgz.asc
-/lxml-3.2.4.tgz
-/lxml-3.2.4.tgz.asc
-/lxml-3.3.0.tgz
-/lxml-3.3.0.tgz.asc
-/lxml-3.3.2.tgz
-/lxml-3.3.2.tgz.asc
-/lxml-3.3.3.tgz
-/lxml-3.3.3.tgz.asc
-/lxml-3.3.5.tgz
-/lxml-3.3.5.tgz.asc
-/lxml-3.3.6.tgz
-/lxml-3.3.6.tgz.asc
-/lxml-3.4.4.tgz
-/lxml-3.4.4.tgz.asc
-/lxml-3.6.4.tar.gz
-/lxml-3.7.0.tar.gz
-/lxml-3.7.1.tgz
-/lxml-3.7.2.tgz
-/lxml-3.8.0.tgz
-/lxml-4.0.0.tgz
-/lxml-4.1.1.tgz
-/lxml-4.2.1.tgz
-/lxml-4.2.3.tgz
-/lxml-4.2.4.tgz
-/lxml-4.2.5.tgz
-/lxml-4.4.0.tgz
-/lxml-4.4.1.tgz
-/lxml-4.5.1.tgz
-/lxml-4.6.2.tar.gz
-/lxml-4.6.3.tar.gz
-/lxml-4.7.1.tar.gz
-/lxml-4.9.1.tar.gz
-/lxml-4.9.2.tar.gz
-/lxml-4.9.2-no-isoschematron.tar.gz
-/lxml-4.9.2-no-isoschematron-rng.tar.gz
-/lxml-4.9.3-no-isoschematron-rng.tar.gz
-/lxml-4.9.4-no-isoschematron-rng.tar.gz
-/lxml-5.1.0-no-isoschematron-rng.tar.gz
-/lxml-5.2.0-no-isoschematron-rng.tar.gz
-/lxml-5.2.1-no-isoschematron-rng.tar.gz
-/lxml-5.3.0-no-isoschematron-rng.tar.gz
-/lxml-5.3.1-no-isoschematron-rng.tar.gz
-/lxml-5.3.2-no-isoschematron-rng.tar.gz
-/lxml-5.4.0-no-isoschematron-rng.tar.gz
-/lxml-6.0.0-no-isoschematron-rng.tar.gz
-/lxml-6.0.1-no-isoschematron-rng.tar.gz
-/lxml-6.0.2-no-isoschematron-rng.tar.gz
--- a/1642
+++ b/1642
--- a/ci.fmf
+++ b/ci.fmf
@ -1 +0,0 @@
-resultsdb-testcase: separate
--- a/gating.yaml
+++ b/gating.yaml
@ -1,8 +0,0 @@
--- !Policy
-product_versions:
-  - fedora-*
-decision_contexts:
-  - bodhi_update_push_testing
-  - bodhi_update_push_stable
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional}
--- a/get-lxml-source.sh
+++ b/get-lxml-source.sh
@ -1,28 +0,0 @@
-#! /bin/bash -ex
-
-# Download a release of lxml (if missing) and remove the isoschematron module from it
-
-version=$1
-
-if [ -z "${version}" ]; then
-    echo "Usage: $0 VERSION" >& 2
-    echo "" >& 2
-    echo "example: $0 4.9.2" >& 2
-    exit 1
-fi
-
-versionedname=lxml-${version}
-orig_archive=${versionedname}.tar.gz
-new_archive=${versionedname}-no-isoschematron-rng.tar.gz
-
-if [ ! -e ${orig_archive} ]; then
-    wget -N https://files.pythonhosted.org/packages/source/l/lxml/${orig_archive}
-fi
-
-deleted_directory=lxml-${version}/src/lxml/isoschematron/resources/rng
-
-# tar --delete does not operate on compressed archives, so do
-# gz decompression explicitly
-gzip --decompress ${orig_archive}
-tar -v --delete -f ${orig_archive//.gz} ${deleted_directory}
-gzip -cf ${orig_archive//.gz} > ${new_archive}
--- a/plans/etree-fromstring.py
+++ b/plans/etree-fromstring.py
@ -1,7 +0,0 @@
-import lxml.etree as et
-s = '<foo><bar baz="xyzzy">a<![CDATA[b]]>c</bar></foo>'
-x = et.fromstring(s)
-t = x.find('bar').text
-print(t)
-if t != 'abc':
-    raise Exception()
--- a/plans/smoke.fmf
+++ b/plans/smoke.fmf
@ -1,12 +0,0 @@
-summary: Basic smoke test
-discover:
-  how: shell
-  tests:
-    - name: /smoke/import-python-module
-      test: |
-        python3 -c 'import importlib as il; print(il.import_module("lxml"))'
-    - name: /smoke/etree-fromstring
-      test: |
-        python3 plans/etree-fromstring.py
-execute:
-  how: tmt
--- a/python-lxml-2.2.6-fix-2to3.patch
+++ b/python-lxml-2.2.6-fix-2to3.patch
@ -0,0 +1,13 @@
+diff -up lxml-2.2.6/src/lxml/html/__init__.py.fix-2to3 lxml-2.2.6/src/lxml/html/__init__.py
+--- lxml-2.2.6/src/lxml/html/__init__.py.fix-2to3	2010-07-26 13:36:42.333672181 -0400
+++ lxml-2.2.6/src/lxml/html/__init__.py	2010-07-26 13:36:52.379671732 -0400
+@@ -823,7 +823,8 @@ def submit_form(form, extra_values=None,
+ def open_http_urllib(method, url, values):
+     ## FIXME: should test that it's not a relative URL or something
+     try:
+-        from urllib import urlencode, urlopen
+        from urllib import urlencode
+        from urllib import urlopen
+     except ImportError: # Python 3
+         from urllib.request import urlopen
+         from urllib.parse import urlencode
--- a/python-lxml.spec
+++ b/python-lxml.spec
@ -1,94 +1,719 @@
-Name:           python-lxml
-Version:        6.0.2
-Release:        %autorelease
-Summary:        XML processing library combining libxml2/libxslt with the ElementTree API
-
-# The lxml project is licensed under BSD-3-Clause
-# Some code is derived from ElementTree and cElementTree
-# thus using the MIT-CMU elementtree license
-# .xsl schematron files are under the MIT license
-License:        BSD-3-Clause AND MIT-CMU AND MIT
-URL:            https://github.com/lxml/lxml
-
-# We use the get-lxml-source.sh script to generate the tarball
-# without the isoschematron RNG validation file under a problematic license.
-# See: https://gitlab.com/fedora/legal/fedora-license-data/-/issues/154
-Source0:        lxml-%{version}-no-isoschematron-rng.tar.gz
-Source1:        get-lxml-source.sh
-
-BuildRequires:  gcc
-BuildRequires:  libxml2-devel
-BuildRequires:  libxslt-devel
-BuildRequires:  python3-devel
-
-# Some of the extras create a build dependency loop.
-# - [cssselect] Requires cssselect BuildRequires lxml
-# - [html5] Requires html5lib BuildRequires lxml
-# - [htmlsoup] Requires beautifulsoup4 Requires lxml
-# - [html_clean] Requires lxml-html-clean Requires lxml
-# Hence we provide a bcond to disable the extras altogether.
-# By default, the extras are disabled in RHEL, to avoid dependencies.
-%bcond extras %{undefined rhel}
-
-%global _description \
-lxml is a Pythonic, mature binding for the libxml2 and libxslt libraries. It\
-provides safe and convenient access to these libraries using the ElementTree It\
-extends the ElementTree API significantly to offer support for XPath, RelaxNG,\
-XML Schema, XSLT, C14N and much more.
-
-%description %{_description}
-
-%package -n     python3-lxml
-Summary:        %{summary}
-%if %{with extras}
-Suggests:       python3-lxml+cssselect
-Suggests:       python3-lxml+html5
-Suggests:       python3-lxml+htmlsoup
-Suggests:       python3-lxml+html_clean
+%if 0%{?fedora} > 12 || 0%{?rhel} > 5
+%global with_python3 1
 %endif

-%description -n python3-lxml %{_description}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

-Python 3 version.
+Name:           python-lxml
+Version:        2.3
+Release:        1%{?dist}
+Summary:        ElementTree-like Python bindings for libxml2 and libxslt

-%if %{with extras}
-%pyproject_extras_subpkg -n python3-lxml cssselect html5 htmlsoup html_clean
+Group:          Development/Libraries
+License:        BSD
+URL:            http://codespeak.net/lxml/
+Source0:        http://cheeseshop.python.org/packages/source/l/lxml/lxml-%{version}.tar.gz
+Source1:        http://cheeseshop.python.org/packages/source/l/lxml/lxml-%{version}.tar.gz.asc
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libxslt-devel
+
+BuildRequires:  python-devel
+BuildRequires:  python-setuptools
+BuildRequires:  Cython >= 0.12
+
+%if 0%{?with_python3}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+%endif
+
+%description
+lxml provides a Python binding to the libxslt and libxml2 libraries.
+It follows the ElementTree API as much as possible in order to provide
+a more Pythonic interface to libxml2 and libxslt than the default
+bindings.  In particular, lxml deals with Python Unicode strings
+rather than encoded UTF-8 and handles memory management automatically,
+unlike the default bindings.
+
+%package docs
+Summary:        Documentation for %{name}
+Group:          Documentation
+BuildArch:      noarch
+%description docs
+This package provides the documentation for %{name}, e.g. the API as html.
+
+
+%if 0%{?with_python3}
+%package -n python3-lxml
+Summary:        ElementTree-like Python 3 bindings for libxml2 and libxslt
+Group:          Development/Libraries
+
+%description -n python3-lxml
+lxml provides a Python 3 binding to the libxslt and libxml2 libraries.
+It follows the ElementTree API as much as possible in order to provide
+a more Pythonic interface to libxml2 and libxslt than the default
+bindings.  In particular, lxml deals with Python 3 Unicode strings
+rather than encoded UTF-8 and handles memory management automatically,
+unlike the default bindings.
 %endif

 %prep
-%autosetup -n lxml-%{version} -p1
-# Don't run html5lib tests --without extras
-%{!?without_extras:rm src/lxml/html/tests/test_html5parser.py}
+%setup -q -n lxml-%{version}

-# Remove limit for version of Cython
-sed -i "s/Cython.*/Cython/" requirements.txt
-sed -i 's/"Cython.*",/"Cython",/' pyproject.toml
+# remove the C extension so that it will be rebuilt using the latest Cython
+rm -f src/lxml/lxml.etree.c
+rm -f src/lxml/lxml.etree_api.h
+rm -f src/lxml/lxml.objectify.c

-%generate_buildrequires
-%pyproject_buildrequires -x source%{?with_extras:,cssselect,html5,htmlsoup,html_clean}
+chmod a-x doc/rest2html.py
+%{__sed} -i 's/\r//' doc/s5/ui/default/print.css \
+    doc/s5/ep2008/atom.rng \
+    doc/s5/ui/default/iepngfix.htc
+
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -r . %{py3dir}
+%endif

 %build
-# Remove pregenerated Cython C sources
-# We need to do this after %%pyproject_buildrequires because setup.py errors
-# without Cython and without the .c files.
-find -type f -name '*.c' -print -delete >&2
-export WITH_CYTHON=true
-%pyproject_wheel
+CFLAGS="%{optflags}" %{__python} setup.py build
+
+%if 0%{?with_python3}
+cp src/lxml/lxml.etree.c %{py3dir}/src/lxml
+cp src/lxml/lxml.etree_api.h %{py3dir}/src/lxml
+cp src/lxml/lxml.objectify.c %{py3dir}/src/lxml
+
+pushd %{py3dir}
+CFLAGS="%{optflags}" %{__python3} setup.py build
+popd
+%endif

 %install
-%pyproject_install
-%pyproject_save_files lxml
+rm -rf %{buildroot}
+%{__python} setup.py install --skip-build --no-compile --root %{buildroot}

-%check
-# The tests assume inplace build, so we copy the built library to source-dir.
-# If not done that, Python can either import the tests or the extension modules, but not both.
-cp -a build/lib.%{python3_platform}-*/* src/
-# The options are: verbose, unit, functional
-%{python3} test.py -vuf
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install --skip-build --no-compile --root %{buildroot}
+popd
+%endif

-%files -n python3-lxml -f %{pyproject_files}
-%license doc/licenses/BSD.txt doc/licenses/elementtree.txt
-%doc README.rst
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc README.txt LICENSES.txt PKG-INFO CREDITS.txt CHANGES.txt
+%{python_sitearch}/lxml
+%{python_sitearch}/lxml-*.egg-info
+
+%files docs
+%defattr(-,root,root,-)
+%doc doc/*
+
+%if 0%{?with_python3}
+%files -n python3-lxml
+%defattr(-,root,root,-)
+%doc README.txt LICENSES.txt PKG-INFO CREDITS.txt CHANGES.txt
+%{python3_sitearch}/lxml-*.egg-info
+%{python3_sitearch}/lxml
+%endif

 %changelog
-%autochangelog
+* Tue Apr 19 2011 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.3-1
+- 2.3 (2011-02-06)
+- ================
+-
+- Features added
+- --------------
+-
+- * When looking for children, ``lxml.objectify`` takes '{}tag' as
+-   meaning an empty namespace, as opposed to the parent namespace.
+-
+- Bugs fixed
+- ----------
+-
+- * When finished reading from a file-like object, the parser
+-   immediately calls its ``.close()`` method.
+-
+- * When finished parsing, ``iterparse()`` immediately closes the input
+-   file.
+-
+- * Work-around for libxml2 bug that can leave the HTML parser in a
+-   non-functional state after parsing a severly broken document (fixed
+-   in libxml2 2.7.8).
+-
+- * ``marque`` tag in HTML cleanup code is correctly named ``marquee``.
+-
+- Other changes
+- --------------
+-
+- * Some public functions in the Cython-level C-API have more explicit
+-   return types.
+-
+- 2.3beta1 (2010-09-06)
+- =====================
+-
+- Features added
+- --------------
+-
+- Bugs fixed
+- ----------
+-
+- * Crash in newer libxml2 versions when moving elements between
+-   documents that had attributes on replaced XInclude nodes.
+-
+- * ``XMLID()`` function was missing the optional ``parser`` and
+-   ``base_url`` parameters.
+-
+- * Searching for wildcard tags in ``iterparse()`` was broken in Py3.
+-
+- * ``lxml.html.open_in_browser()`` didn't work in Python 3 due to the
+-   use of os.tempnam.  It now takes an optional 'encoding' parameter.
+-
+- Other changes
+- --------------
+-
+- 2.3alpha2 (2010-07-24)
+- ======================
+-
+- Features added
+- --------------
+-
+- Bugs fixed
+- ----------
+-
+- * Crash in XSLT when generating text-only result documents with a
+-   stylesheet created in a different thread.
+-
+- Other changes
+- --------------
+-
+- * ``repr()`` of Element objects shows the hex ID with leading 0x
+-   (following ElementTree 1.3).
+-
+- 2.3alpha1 (2010-06-19)
+- ======================
+-
+- Features added
+- --------------
+-
+- * Keyword argument ``namespaces`` in ``lxml.cssselect.CSSSelector()``
+-   to pass a prefix-to-namespace mapping for the selector.
+-
+- * New function ``lxml.etree.register_namespace(prefix, uri)`` that
+-   globally registers a namespace prefix for a namespace that newly
+-   created Elements in that namespace will use automatically.  Follows
+-   ElementTree 1.3.
+-
+- * Support 'unicode' string name as encoding parameter in
+-   ``tostring()``, following ElementTree 1.3.
+-
+- * Support 'c14n' serialisation method in ``ElementTree.write()`` and
+-   ``tostring()``, following ElementTree 1.3.
+-
+- * The ElementPath expression syntax (``el.find*()``) was extended to
+-   match the upcoming ElementTree 1.3 that will ship in the standard
+-   library of Python 3.2/2.7.  This includes extended support for
+-   predicates as well as namespace prefixes (as known from XPath).
+-
+- * During regular XPath evaluation, various ESXLT functions are
+-   available within their namespace when using libxslt 1.1.26 or later.
+-
+- * Support passing a readily configured logger instance into
+-   ``PyErrorLog``, instead of a logger name.
+-
+- * On serialisation, the new ``doctype`` parameter can be used to
+-   override the DOCTYPE (internal subset) of the document.
+-
+- * New parameter ``output_parent`` to ``XSLTExtension.apply_templates()``
+-   to append the resulting content directly to an output element.
+-
+- * ``XSLTExtension.process_children()`` to process the content of the
+-   XSLT extension element itself.
+-
+- * ISO-Schematron support based on the de-facto Schematron reference
+-   'skeleton implementation'.
+-
+- * XSLT objects now take XPath object as ``__call__`` stylesheet
+-   parameters.
+-
+- * Enable path caching in ElementPath (``el.find*()``) to avoid parsing
+-   overhead.
+-
+- * Setting the value of a namespaced attribute always uses a prefixed
+-   namespace instead of the default namespace even if both declare the
+-   same namespace URI.  This avoids serialisation problems when an
+-   attribute from a default namespace is set on an element from a
+-   different namespace.
+-
+- * XSLT extension elements: support for XSLT context nodes other than
+-   elements: document root, comments, processing instructions.
+-
+- * Support for strings (in addition to Elements) in node-sets returned
+-   by extension functions.
+-
+- * Forms that lack an ``action`` attribute default to the base URL of
+-   the document on submit.
+-
+- * XPath attribute result strings have an ``attrname`` property.
+-
+- * Namespace URIs get validated against RFC 3986 at the API level
+-   (required by the XML namespace specification).
+-
+- * Target parsers show their target object in the ``.target`` property
+-   (compatible with ElementTree).
+-
+- Bugs fixed
+- ----------
+-
+- * API is hardened against invalid proxy instances to prevent crashes
+-   due to incorrectly instantiated Element instances.
+-
+- * Prevent crash when instantiating ``CommentBase`` and friends.
+-
+- * Export ElementTree compatible XML parser class as
+-   ``XMLTreeBuilder``, as it is called in ET 1.2.
+-
+- * ObjectifiedDataElements in lxml.objectify were not hashable.  They
+-   now use the hash value of the underlying Python value (string,
+-   number, etc.) to which they compare equal.
+-
+- * Parsing broken fragments in lxml.html could fail if the fragment
+-   contained an orphaned closing '</div>' tag.
+-
+- * Using XSLT extension elements around the root of the output document
+-   crashed.
+-
+- * ``lxml.cssselect`` did not distinguish between ``x[attr="val"]`` and
+-   ``x [attr="val"]`` (with a space).  The latter now matches the
+-   attribute independent of the element.
+-
+- * Rewriting multiple links inside of HTML text content could end up
+-   replacing unrelated content as replacements could impact the
+-   reported position of subsequent matches.  Modifications are now
+-   simplified by letting the ``iterlinks()`` generator in ``lxml.html``
+-   return links in reversed order if they appear inside the same text
+-   node.  Thus, replacements and link-internal modifications no longer
+-   change the position of links reported afterwards.
+-
+- * The ``.value`` attribute of ``textarea`` elements in lxml.html did
+-   not represent the complete raw value (including child tags etc.). It
+-   now serialises the complete content on read and replaces the
+-   complete content by a string on write.
+-
+- * Target parser didn't call ``.close()`` on the target object if
+-   parsing failed.  Now it is guaranteed that ``.close()`` will be
+-   called after parsing, regardless of the outcome.
+-
+- Other changes
+- -------------
+-
+- * Official support for Python 3.1.2 and later.
+-
+- * Static MS Windows builds can now download their dependencies
+-   themselves.
+-
+- * ``Element.attrib`` no longer uses a cyclic reference back to its
+-   Element object.  It therefore no longer requires the garbage
+-   collector to clean up.
+-
+- * Static builds include libiconv, in addition to libxml2 and libxslt.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Dec 29 2010  David Malcolm <dmalcolm@redhat.com> - 2.2.8-3
+- rebuild for newer python3
+
+* Fri Nov  5 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2.8-2
+- Rebuild for newer libxml2
+
+* Mon Sep  6 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2.8-1
+- 2.2.8 (2010-09-02)
+- Bugs fixed
+-
+-     * Crash in newer libxml2 versions when moving elements between
+-       documents that had attributes on replaced XInclude nodes.
+-     * Import fix for urljoin in Python 3.1+.
+
+* Tue Aug 24 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2.7-3
+- Don't byte-compile files during install because setup.py doesn't
+  properly byte compile for Python version 3.2
+
+* Sun Aug 22 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2.7-2
+- Rebuild for Python 3.2
+
+* Mon Jul 26 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2.7-1
+- 2.2.7 (2010-07-24)
+- Bugs fixed
+-
+-     * Crash in XSLT when generating text-only result documents with a stylesheet created in a different thread.
+
+* Mon Jul 26 2010 David Malcolm <dmalcolm@redhat.com> - 2.2.6-4
+- actually add the patch this time
+
+* Mon Jul 26 2010 David Malcolm <dmalcolm@redhat.com> - 2.2.6-3
+- workaround for 2to3 issue (patch 0; bug 600036)
+
+* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 2.2.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Tue Mar  2 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2.6-1
+- 2.2.6 (2010-03-02)
+-
+- Bugs fixed
+-
+-    * Fixed several Python 3 regressions by building with Cython 0.11.3.
+
+* Mon Mar  1 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2.5-1
+- 2.2.5 (2010-02-28)
+-
+- Features added
+-
+-    * Support for running XSLT extension elements on the input root node
+-      (e.g. in a template matching on "/").
+-
+- Bugs fixed
+-
+-    * Crash in XPath evaluation when reading smart strings from a document
+-      other than the original context document.
+-    * Support recent versions of html5lib by not requiring its XHTMLParser
+-      in htmlparser.py anymore.
+-    * Manually instantiating the custom element classes in lxml.objectify
+-      could crash.
+-    * Invalid XML text characters were not rejected by the API when they
+-      appeared in unicode strings directly after non-ASCII characters.
+-    * lxml.html.open_http_urllib() did not work in Python 3.
+-    * The functions strip_tags() and strip_elements() in lxml.etree did
+-      not remove all occurrences of a tag in all cases.
+-    * Crash in XSLT extension elements when the XSLT context node is not
+-      an element.
+
+* Mon Feb 15 2010 Thomas Spura <tomspur@fedoraproject.org> - 2.2.4-2
+- update to current python3 guidelines
+- be more explicit in %%files
+- use %%global and not %%define
+- create docs subpackage
+- add stripping 3-byte Byte Order Marker from src/lxml/tests/test_errors.py
+  to get 2to3 to work (dmalcolm)
+- fixes FTBFS (#564674)
+
+* Thu Jan 14 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2.4-1
+- Update to 2.2.4
+- Enable Python 3 subpackage
+
+* Thu Nov  5 2009 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2.3-3
+- F-13's python build chain must be a little different...
+
+* Thu Nov  5 2009 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2.3-2
+- Add option to build a Python 3 subpackage, original patch by David Malcolm
+
+* Fri Oct 30 2009 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2.3-1
+- 2.2.3 (2009-10-30)
+- Bugs fixed
+-
+-    * The resolve_entities option did not work in the incremental feed
+-      parser.
+-    * Looking up and deleting attributes without a namespace could hit a
+-      namespaced attribute of the same name instead.
+-    * Late errors during calls to SubElement() (e.g. attribute related
+-      ones) could leave a partially initialised element in the tree.
+-    * Modifying trees that contain parsed entity references could result
+-      in an infinite loop.
+-    * ObjectifiedElement.__setattr__ created an empty-string child element
+-      when the attribute value was rejected as a non-unicode/non-ascii
+-      string
+-    * Syntax errors in lxml.cssselect could result in misleading error
+-      messages.
+-    * Invalid syntax in CSS expressions could lead to an infinite loop in
+-      the parser of lxml.cssselect.
+-    * CSS special character escapes were not properly handled in
+-      lxml.cssselect.
+-    * CSS Unicode escapes were not properly decoded in lxml.cssselect.
+-    * Select options in HTML forms that had no explicit value attribute
+-      were not handled correctly. The HTML standard dictates that their
+-      value is defined by their text content. This is now supported by
+-      lxml.html.
+-    * XPath raised a TypeError when finding CDATA sections. This is now
+-      fully supported.
+-    * Calling help(lxml.objectify) didn't work at the prompt.
+-    * The ElementMaker in lxml.objectify no longer defines the default
+-      namespaces when annotation is disabled.
+-    * Feed parser failed to honour the 'recover' option on parse errors.
+-    * Diverting the error logging to Python's logging system was broken.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Jun 21 2009 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2.2-1
+- 2.2.2 (2009-06-21)
+- Features added
+-
+-    * New helper functions strip_attributes(), strip_elements(),
+-      strip_tags() in lxml.etree to remove attributes/subtrees/tags
+-      from a subtree.
+-
+- Bugs fixed
+-
+-    * Namespace cleanup on subtree insertions could result in missing
+-      namespace declarations (and potentially crashes) if the element
+-      defining a namespace was deleted and the namespace was not used
+-      by the top element of the inserted subtree but only in deeper
+-      subtrees.
+-    * Raising an exception from a parser target callback didn't always
+-      terminate the parser.
+-    * Only {true, false, 1, 0} are accepted as the lexical representation
+-      for BoolElement ({True, False, T, F, t, f} not any more), restoring
+-      lxml <= 2.0 behaviour.
+
+* Tue Jun  2 2009 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2.1-1
+- 2.2.1 (2009-06-02)
+- Features added
+-
+-    * Injecting default attributes into a document during XML Schema
+-      validation (also at parse time).
+-    * Pass huge_tree parser option to disable parser security restrictions
+-      imposed by libxml2 2.7.
+-
+- Bugs fixed
+-
+-    * The script for statically building libxml2 and libxslt didn't work
+-      in Py3.
+-    * XMLSchema() also passes invalid schema documents on to libxml2 for
+-      parsing (which could lead to a crash before release 2.6.24).
+
+* Tue Mar 24 2009 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2-1
+- 2.2 (2009-03-21)
+- Features added
+-
+-    * Support for standalone flag in XML declaration through
+-      tree.docinfo.standalone and by passing standalone=True/False on
+-      serialisation.
+-
+- Bugs fixed
+-
+-    * Crash when parsing an XML Schema with external imports from a
+-      filename.
+
+* Fri Feb 27 2009 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2-0.8.beta4
+- 2.2beta4 (2009-02-27)
+- Features added
+-
+-    * Support strings and instantiable Element classes as child arguments
+-      to the constructor of custom Element classes.
+-    * GZip compression support for serialisation to files and file-like
+-      objects.
+-
+- Bugs fixed
+-
+-    * Deep-copying an ElementTree copied neither its sibling PIs and
+-      comments nor its internal/external DTD subsets.
+-    * Soupparser failed on broken attributes without values.
+-    * Crash in XSLT when overwriting an already defined attribute using
+-      xsl:attribute.
+-    * Crash bug in exception handling code under Python 3. This was due to
+-      a problem in Cython, not lxml itself.
+-    * lxml.html.FormElement._name() failed for non top-level forms.
+-    * TAG special attribute in constructor of custom Element classes was
+-      evaluated incorrectly.
+-
+- Other changes
+-
+-    * Official support for Python 3.0.1.
+-    * Element.findtext() now returns an empty string instead of None for
+-      Elements without text content.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-0.7.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 17 2009 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2-0.6.beta3
+- 2.2beta3 (2009-02-17)
+- Features added
+-
+-    * XSLT.strparam() class method to wrap quoted string parameters that
+-     require escaping.
+-
+- Bugs fixed
+-
+-    * Memory leak in XPath evaluators.
+-    * Crash when parsing indented XML in one thread and merging it with
+-      other documents parsed in another thread.
+-    * Setting the base attribute in lxml.objectify from a unicode string
+-      failed.
+-    * Fixes following changes in Python 3.0.1.
+-    * Minor fixes for Python 3.
+-
+- Other changes
+-
+-    * The global error log (which is copied into the exception log) is now
+-      local to a thread, which fixes some race conditions.
+-    * More robust error handling on serialisation.
+
+* Sun Jan 25 2009 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2-0.5.beta2
+- 2.2beta2 (2009-01-25)
+- Bugs fixed
+-
+-    * Potential memory leak on exception handling. This was due to a
+-      problem in Cython, not lxml itself.
+-    * iter_links (and related link-rewriting functions) in lxml.html would
+-      interpret CSS like url("link") incorrectly (treating the quotation
+-      marks as part of the link).
+-    * Failing import on systems that have an io module.
+
+* Fri Dec 12 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2-0.4.beta1
+- 2.2beta1 (2008-12-12)
+- Features added
+-
+-    * Allow lxml.html.diff.htmldiff to accept Element objects,
+-      not just HTML strings.
+-
+- Bugs fixed
+-
+-    * Crash when using an XPath evaluator in multiple threads.
+-    * Fixed missing whitespace before Link:... in lxml.html.diff.
+-
+- Other changes
+-
+-    * Export lxml.html.parse.
+
+* Fri Nov 28 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2-0.3.alpha1
+- Rebuild for Python 2.6
+
+* Mon Nov 24 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2-0.2.alpha1
+- Don't forget to upload the sources!
+
+* Mon Nov 24 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.2-0.1.alpha1
+- 2.2alpha1 (2008-11-23)
+- Features added
+-
+-    * Support for XSLT result tree fragments in XPath/XSLT extension
+-      functions.
+-    * QName objects have new properties namespace and localname.
+-    * New options for exclusive C14N and C14N without comments.
+-    * Instantiating a custom Element classes creates a new Element.
+-
+- Bugs fixed
+-
+-    * XSLT didn't inherit the parse options of the input document.
+-    * 0-bytes could slip through the API when used inside of Unicode
+-      strings.
+-    * With lxml.html.clean.autolink, links with balanced parenthesis, that
+-      end in a parenthesis, will be linked in their entirety (typical with
+-      Wikipedia links).
+
+* Mon Nov 17 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.1.3-1
+- 2.1.3 (2008-11-17)
+- Bugs fixed
+-
+-    * Ref-count leaks when lxml enters a try-except statement while an
+-      outside exception lives in sys.exc_*(). This was due to a problem
+-      in Cython, not lxml itself.
+-    * Parser Unicode decoding errors could get swallowed by other
+-      exceptions.
+-    * Name/import errors in some Python modules.
+-    * Internal DTD subsets that did not specify a system or public ID
+-      were not serialised and did not appear in the docinfo property
+-      of ElementTrees.
+-    * Fix a pre-Py3k warning when parsing from a gzip file in Py2.6.
+-    * Test suite fixes for libxml2 2.7.
+-    * Resolver.resolve_string() did not work for non-ASCII byte strings.
+-    * Resolver.resolve_file() was broken.
+-    * Overriding the parser encoding didn't work for many encodings.
+
+* Fri Sep  5 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.1.2-1
+- 2.1.2 (2008-09-05)
+- Features added
+-
+-    * lxml.etree now tries to find the absolute path name of files when
+-      parsing from a file-like object. This helps custom resolvers when
+-      resolving relative URLs, as lixbml2 can prepend them with the path of
+-      the source document.
+-
+- Bugs fixed
+-
+-    * Memory problem when passing documents between threads.
+-    * Target parser did not honour the recover option and raised an exception
+-      instead of calling .close() on the target.
+
+* Fri Jul 25 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.1.1-1
+- Update to 2.1.1
+
+* Fri Jun 20 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.0.7-1
+- Update to 2.0.7
+- Update download URL
+
+* Sat May 31 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.0.6-1
+- Update to 2.0.6
+
+* Thu May  8 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.0.5-1
+- Update to 2.0.5
+
+* Wed Mar 26 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.0.3-1
+- Update to 2.0.3
+
+* Sat Feb 23 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.0.2-1
+- Update to 2.0.2
+
+* Tue Feb 19 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.0.1-1
+- Update to 2.0.1
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.3.6-2
+- Autorebuild for GCC 4.3
+
+* Mon Nov  4 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.3.6-1
+- Update to 1.3.6.
+
+* Mon Oct 22 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.3.5-1
+- Update to 1.3.5.
+
+* Thu Aug 30 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.3.4-1
+- Update to 1.3.4.
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.3.3-3
+- Rebuild for selinux ppc32 issue.
+
+* Tue Aug 28 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.3.3-2
+- BR python-setuptools-devel
+
+* Mon Jul 30 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.3.3-1
+- Update to 1.3.3
+
+* Fri Jan 19 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.2-1
+- Update to 1.1.2
+
+* Thu Dec 14 2006 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.0.3-3
+- Rebuild for new Python
+
+* Sat Sep 16 2006 Shahms E. King <shahms@shahms.com> 1.0.3-2
+- Rebuild for FC6
+
+* Thu Aug 17 2006 Shahms E. King <shahms@shahms.com> 1.0.3-1
+- Update to new upstream version
+
+* Fri Aug 11 2006 Shahms E. King <shahms@shahms.com> 1.0.2-2
+- Include, don't ghost .pyo files per new guidelines
+
+* Fri Jul 07 2006 Shahms E. King <shahms@shahms.com> 1.0.2-1
+- Update to new upstream release
+
+* Mon Jun 26 2006 Shahms E. King <shahms@shahms.com> 1.0.1-1
+- Update to new upstream release
+
+* Fri Jun 02 2006 Shahms E. King <shahms@shahms.com> 1.0-1
+- Update to new upstream 1.0 release
+
+* Wed Apr 26 2006 Shahms E. King <shahms@shahms.com> 0.9.1-3
+- Add python-setuptools to BuildRequires
+- Use dist tag
+
+* Wed Apr 26 2006 Shahms E. King <shahms@shahms.com> 0.9.1-2
+- Fix summary and description
+
+* Tue Apr 18 2006 Shahms E. King <shahms@shahms.com> 0.9.1-1
+- update the new upstream version
+- remove Pyrex build req
+
+* Tue Dec 13 2005 Shahms E. King <shahms@shahms.com> 0.8-1
+- Initial package
--- a/3
+++ b/3
@ -1 +1,2 @@
-SHA512 (lxml-6.0.2-no-isoschematron-rng.tar.gz) = dc89f75c3a3c828a46bcb2eefbebe8f98ce8072b9fb66f8ef81edbf2babed74e4c54e26392603319d60ab3bfab6a4795eedc85b28efba815797d43d53aae4060
+a245a015fd59b63e220005f263e1682a  lxml-2.3.tar.gz
+50f26dd559af7c9c0b1c58d4772231b5  lxml-2.3.tar.gz.asc