rpms/python-lxml/devel python-lxml-2.2.6-fix-2to3.patch, NONE, 1.1 python-lxml.spec, 1.46, 1.47 python-lxml-2.2.6-3.fc14.src.rpm, 1.1, NONE

[dmalcolm]

Author: dmalcolm

Update of /cvs/pkgs/rpms/python-lxml/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6420

Modified Files:
	python-lxml.spec 
Added Files:
	python-lxml-2.2.6-fix-2to3.patch 
Removed Files:
	python-lxml-2.2.6-3.fc14.src.rpm 
Log Message:
add the patch; remove the mistakenly-added src.rpm


python-lxml-2.2.6-fix-2to3.patch:
 __init__.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE python-lxml-2.2.6-fix-2to3.patch ---
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


Index: python-lxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/devel/python-lxml.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- python-lxml.spec	26 Jul 2010 17:57:39 -0000	1.46
+++ python-lxml.spec	26 Jul 2010 18:02:23 -0000	1.47
@@ -6,7 +6,7 @@
 
 Name:           python-lxml
 Version:        2.2.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        ElementTree-like Python bindings for libxml2 and libxslt
 
 Group:          Development/Libraries
@@ -135,6 +135,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Mon Jul 26 2010 David Malcolm <dmalcolm at redhat.com> - 2.2.6-4
+- actually add the patch this time
+
 * Mon Jul 26 2010 David Malcolm <dmalcolm at redhat.com> - 2.2.6-3
 - workaround for 2to3 issue (patch 0; bug 600036)
 


--- python-lxml-2.2.6-3.fc14.src.rpm DELETED ---