[yum-cvs] yum/yum comps.py,1.12,1.13 repoMDObject.py,1.3,1.4

[Jeremy Katz]

Update of /home/groups/yum/cvs/yum/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv24980/yum

Modified Files:
	comps.py repoMDObject.py 
Log Message:
for python2.5, cElementTree is now xml.etree; use it


Index: comps.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/comps.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- comps.py	5 Dec 2006 00:40:51 -0000	1.12
+++ comps.py	5 Dec 2006 20:45:10 -0000	1.13
@@ -15,7 +15,11 @@
 
 import sys
 from constants import *
-from cElementTree import iterparse
+try:
+    from xml.etree import cElementTree
+except ImportError:
+    import cElementTree
+iterparse = cElementTree.iterparse
 import exceptions
 
 

Index: repoMDObject.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/repoMDObject.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- repoMDObject.py	13 Jun 2006 03:03:00 -0000	1.3
+++ repoMDObject.py	5 Dec 2006 20:45:10 -0000	1.4
@@ -14,7 +14,11 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 # Copyright 2006 Duke University
 
-from cElementTree import iterparse
+try:
+    from xml.etree import cElementTree
+except ImportError:
+    import cElementTree
+iterparse = cElementTree.iterparse
 from Errors import RepoMDError
 
 import sys