use curl instead of urllib

pythonbrew/downloader.py

@@ -1,51 +1,21 @@
-import sys
-import urllib
-import urllib2
-from pythonbrew.util import size_format
 from pythonbrew.define import PYTHON_VERSION_URL, PYTHONBREW_STABLE_VERSION_URL, \
     PYTHONBREW_UPDATE_URL_PYPI, PYTHONBREW_UPDATE_URL_HEAD
 from pythonbrew.log import logger
+from pythonbrew.curl import Curl
 
-def get_response_from_url(url):
-    try:
-        resp = urllib2.urlopen(url)
-    except urllib2.HTTPError, e:
-        logger.error("HTTP error %s while getting %s" % (e.code, url))
-        sys.exit(1)
-    except IOError, e:
-        # Typically an FTP error
-        logger.error("Error %s while getting %s" % (e, url))
-        sys.exit(1)
-    return resp
+def get_headerinfo_from_url(url):
+    c = Curl()
+    return c.readheader(url)
 
 def get_stable_version():
-    resp = get_response_from_url(PYTHONBREW_STABLE_VERSION_URL)
-    return resp.read()
+    c = Curl()
+    return c.read(PYTHONBREW_STABLE_VERSION_URL)
 
 class Downloader(object):
-    def __init__(self):
-        self._msg = ""
-        self._last_msg = ""
-        self._bytes = 0.0
-    
     def download(self, msg, url, path):
-        self._msg = msg
-        self._bytes = 0
-        urllib.urlretrieve(url, path, self._download_progress)
-        print " downloaded."
-    
-    def _download_progress(self, block, blockbytes, maxbytes):
-        self._bytes += float(blockbytes)
-        if self._bytes >= maxbytes:
-            self._bytes = maxbytes
-        percent = (self._bytes / maxbytes) * 100
-        max_size = size_format(maxbytes)
-        now_size = size_format(self._bytes)
-        now_msg = "\rDownloading %s (%s): %3i%%  %s" % (self._msg, max_size, percent, now_size)
-        padding = " " * (len(self._last_msg) - len(now_msg))
-        sys.stdout.write("%s%s" % (now_msg, padding))
-        sys.stdout.flush()
-        self._last_msg = now_msg
+        logger.info("Downloading %s as %s" % (msg, path))
+        c = Curl()
+        c.fetch(url, path)
 
 def get_pythonbrew_update_url(version):
     if version == "head":