[yum-commits] urlgrabber/grabber.py

[skvidal at osuosl.org]

 urlgrabber/grabber.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 678bd872b07c5b59dee1c517da5d011540809540
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Aug 27 12:45:38 2009 -0400

    make proxy=_none_ properly disable all proxies as per the docs

diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
index 9692219..6b09877 100644
--- a/urlgrabber/grabber.py
+++ b/urlgrabber/grabber.py
@@ -1615,14 +1615,16 @@ class PyCurlFileObject():
                     if scheme not in ('ftp'):
                         continue
                     else:
+                        if proxy == '_none_': proxy = ""
                         self.curl_obj.setopt(pycurl.PROXY, proxy)
                 elif self.scheme in ('http', 'https'):
                     if scheme not in ('http', 'https'):
                         continue
                     else:
+                        if proxy == '_none_': proxy = ""
                         self.curl_obj.setopt(pycurl.PROXY, proxy)
-        
-        # username/password/auth settings
+            
+        # FIXME username/password/auth settings
 
         #posts - simple - expects the fields as they are
         if opts.data: