[yum-cvs] yum/yum parser.py,1.8.2.2,1.8.2.3

[James Bowes]

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

Modified Files:
      Tag: yum-3_0_X
	parser.py 
Log Message:
Urlgrabber will always be used here (especially since we don't import urllib)

Index: parser.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/parser.py,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- parser.py	17 Oct 2006 03:54:19 -0000	1.8.2.2
+++ parser.py	19 Dec 2006 03:50:15 -0000	1.8.2.3
@@ -63,14 +63,6 @@
         # these just make confpp look more like a real file object.
         self.mode = 'r' 
         
-        # establish whether to use urlgrabber or urllib
-        # we want to use urlgrabber if it supports urlopen
-        if hasattr(urlgrabber.grabber, 'urlopen'):
-            self._urlresolver = urlgrabber.grabber
-        else: 
-            self._urlresolver = urllib
-        
-        
         # first make configfile a url even if it points to 
         # a local file
         scheme = urlparse.urlparse(configfile)[0]
@@ -181,7 +173,7 @@
         if self._urlalreadyincluded(absurl):
             return None
         try:
-            fo = self._urlresolver.urlopen(absurl)
+            fo = urlgrabber.grabber.urlopen(absurl)
         except urlgrabber.grabber.URLGrabError, e:
             fo = None
         if fo is not None: