Merge branch 'master' into f12

.gitignore

@@ -1,2 +1,4 @@
 lxml-2.2.5.tar.gz
 lxml-2.2.5.tar.gz.asc
+lxml-2.2.7.tar.gz
+lxml-2.2.7.tar.gz.asc

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

python-lxml.spec

@@ -5,7 +5,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-lxml
-Version:        2.2.5
+Version:        2.2.7
 Release:        1%{?dist}
 Summary:        ElementTree-like Python bindings for libxml2 and libxslt
 
@@ -14,6 +14,11 @@ 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
+
+# Workaround for bug 600036: 2to3 chokes on certain lines
+# Reported upstream against 2to3 as listed in that bug
+Patch0:         python-lxml-2.2.6-fix-2to3.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxslt-devel
@@ -61,6 +66,8 @@ unlike the default bindings.
 %prep
 %setup -q -n lxml-%{version}
 
+%patch0 -p1
+
 chmod a-x doc/rest2html.py
 %{__sed} -i 's/\r//' doc/s5/ui/default/print.css \
     doc/s5/ep2008/atom.rng \
@@ -128,6 +135,28 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* 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)
 - 

sources

@@ -1,2 +1,2 @@
-2ce79c4162c25063f58975a9a1f63e27  lxml-2.2.5.tar.gz
-dd02c1ae95b68970eb67aad1580b8f80  lxml-2.2.5.tar.gz.asc
+c1da56b823fdc00804938d2b788dbfd0  lxml-2.2.7.tar.gz
+f95e37b17d4e7040611d96df0f7193a3  lxml-2.2.7.tar.gz.asc