[yum-commits] 2 commits - urlgrabber/grabber.py urlgrabber/__init__.py

[zpavlas at osuosl.org]

 urlgrabber/__init__.py |    4 ++--
 urlgrabber/grabber.py  |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit d3eca859ed87092efafa5f959ac234f7f83e4baa
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Wed Dec 18 13:13:11 2013 +0100

    bump version to 3.10.1

diff --git a/urlgrabber/__init__.py b/urlgrabber/__init__.py
index f10f488..b3047b0 100644
--- a/urlgrabber/__init__.py
+++ b/urlgrabber/__init__.py
@@ -44,8 +44,8 @@ following features:
     automatically switching mirrors if there is a failure.
 """
 
-__version__ = '3.10'
-__date__    = '2013/10/09'
+__version__ = '3.10.1'
+__date__    = '2013/12/18'
 __author__  = 'Michael D. Stenner <mstenner at linux.duke.edu>, ' \
               'Ryan Tomayko <rtomayko at naeblis.cx>' \
               'Seth Vidal <skvidal at fedoraproject.org>' \
commit 857af5ac1cec0a06755b75286ae2192e398cd341
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Wed Dec 18 13:12:00 2013 +0100

    Don't fail with older pycurl.

diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
index 579c2ff..ef18d6a 100644
--- a/urlgrabber/grabber.py
+++ b/urlgrabber/grabber.py
@@ -1903,8 +1903,9 @@ class PyCurlFileObject(object):
             urllib.addinfourl, via. urllib.URLopener.* """
         return self.url
         
-# tell curl to return immediately on ctrl-c
-pycurl.global_init(pycurl.GLOBAL_DEFAULT | pycurl.GLOBAL_ACK_EINTR)
+if hasattr(pycurl, 'GLOBAL_ACK_EINTR'):
+    # fail immediately on ctrl-c
+    pycurl.global_init(pycurl.GLOBAL_DEFAULT | pycurl.GLOBAL_ACK_EINTR)
 _curl_cache = pycurl.Curl() # make one and reuse it over and over and over
 
 def reset_curl_obj():