rpms/python-yadis/devel python-yadis-1.1.0-silencepyflakes+elementtree.patch, NONE, 1.1 python-yadis.spec, 1.2, 1.3

[Jeffrey C. Ollie (jcollie)]

Author: jcollie

Update of /cvs/extras/rpms/python-yadis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19131

Modified Files:
	python-yadis.spec 
Added Files:
	python-yadis-1.1.0-silencepyflakes+elementtree.patch 
Log Message:
Really fix elementtree problems

python-yadis-1.1.0-silencepyflakes+elementtree.patch:

--- NEW FILE python-yadis-1.1.0-silencepyflakes+elementtree.patch ---
--- yadis/etxrd.py.orig	2007-01-14 08:26:25.000000000 -0600
+++ yadis/etxrd.py	2007-01-14 12:52:22.000000000 -0600
@@ -20,15 +20,11 @@
 
 import random
 
-from elementtree.ElementTree import ElementTree
+from xml.etree.ElementTree import ElementTree
 
 # Use expat if it's present. Otherwise, use xmllib
-try:
-    from xml.parsers.expat import ExpatError as XMLError
-    from elementtree.ElementTree import XMLTreeBuilder
-except ImportError:
-    from elementtree.SimpleXMLTreeBuilder import TreeBuilder as XMLTreeBuilder
-    from xmllib import Error as XMLError
+from xml.parsers.expat import ExpatError as XMLError
+from xml.etree.ElementTree import XMLTreeBuilder
 
 from yadis import xri
 


Index: python-yadis.spec
===================================================================
RCS file: /cvs/extras/rpms/python-yadis/devel/python-yadis.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-yadis.spec	13 Jan 2007 23:39:14 -0000	1.2
+++ python-yadis.spec	14 Jan 2007 21:16:07 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           python-yadis
 Version:        1.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Relying party support for the Yadis service discovery protocol
 
 Group:          Development/Languages
@@ -10,6 +10,7 @@
 URL:            http://www.openidenabled.com/yadis/libraries/python
 Source0:        http://www.openidenabled.com/resources/downloads/python-openid/python-yadis-%{version}.tar.gz
 Patch0:         python-yadis-1.0.1-silencepyflakes.patch
+Patch1:         python-yadis-1.1.0-silencepyflakes+elementtree.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -42,7 +43,11 @@
 
 %prep
 %setup0 -q
+%if %{fedora} < 7
 %patch0 -p0
+%else
+%patch1 -p0
+%endif
 
 # remove examples/apache/.htaccess - the same content is available in
 # examples/apache/htaccess.txt
@@ -67,6 +72,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Sun Jan 14 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.0-3
+- Really fix elementtree usage in python 2.5.
+
 * Sat Jan 13 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.0-2
 - python-elementtree is built in to python 2.5 in fc7+