Bug fix for pull request #2

pythonz/curl.py

@@ -1,6 +1,5 @@
 
 import re
-import sys
 import subprocess
 
 from subprocess import Popen, PIPE
@@ -10,11 +9,10 @@
 from pythonz.exceptions import CurlFetchException
 
 class Curl(object):
-    def __init__(self):
+    @classmethod
+    def can_use(cls):
         returncode = subprocess.call("command -v curl > /dev/null", shell=True)
-        if returncode:
-            logger.log("pythonz required curl. curl was not found in your path.")
-            sys.exit(1)
+        return not returncode
 
     def read(self, url):
         p = Popen("curl -skL %s" % url, stdout=PIPE, shell=True)

pythonz/downloader.py

@@ -2,15 +2,23 @@
 from pythonz.define import PYTHON_VERSIONS_URLS
 from pythonz.log import logger
 from pythonz.curl import Curl
+from pythonz.genericdownloader import GenericDownloader
+
+
+def get_concrete_downloader():
+    if Curl.can_use():
+        return Curl()
+    else:
+        return GenericDownloader()
 
 def get_headerinfo_from_url(url):
-    c = Curl()
+    c = get_concrete_downloader()
     return c.readheader(url)
 
 class Downloader(object):
     def download(self, msg, url, path):
         logger.info("Downloading %s as %s" % (msg, path))
-        c = Curl()
+        c = get_concrete_downloader()
         c.fetch(url, path)
 
 def get_python_version_url(type, version):

pythonz/genericdownloader.py

@@ -0,0 +1,71 @@
+# coding: utf-8
+
+import re
+import urllib
+import urllib2
+import sys
+import traceback
+
+from pythonz.log import logger
+from pythonz.exceptions import CurlFetchException
+
+class ProgressBar(object):
+    def __init__(self, out=sys.stdout):
+        self._term_width = 79
+        self._out = out
+
+    def update_line(self, current):
+        num_bar = int(current / 100.0 * (self._term_width - 5))
+        bars = u'#' * num_bar
+        spaces = u' ' * (self._term_width - 5 - num_bar)
+        percentage = u'%3d' % int(current) + u'%\r'
+        return bars + spaces + u' ' + percentage
+
+    def reporthook(self, blocknum, bs, size):
+        current = (blocknum * bs * 100) / size
+        if current > 100:
+            current = 100
+        self._out.write(self.update_line(current))
+        self._out.flush()
+
+    def finish(self):
+        self._out.write(self.update_line(100))
+        self._out.flush()
+
+class HEADRequest(urllib2.Request):
+    def get_method(self):
+        return "HEAD"
+
+class GenericDownloader(object):
+    @classmethod
+    def can_use(cls):
+        return True
+
+    def read(self, url):
+        try:
+            r = urllib.urlopen(url)
+        except IOError:
+            logger.log(traceback.format_exc())
+            raise CurlFetchException('Failed to fetch.')
+        return r.read()
+
+    def readheader(self, url):
+        try:
+            req = HEADRequest(url)
+            res = urllib2.urlopen(req)
+        except IOError:
+            logger.log(traceback.format_exc())
+            raise CurlFetchException('Failed to fetch.')
+        if res.code != 200:
+            raise CurlFetchException('Failed to fetch.')
+        return res.info()
+
+    def fetch(self, url, filename):
+        b = ProgressBar()
+        try:
+            urllib.urlretrieve(url, filename, b.reporthook)
+            sys.stdout.write('\n')
+        except IOError:
+            sys.stdout.write('\n')
+            logger.log(traceback.format_exc())
+            raise CurlFetchException('Failed to fetch.')