Attachment 592127 Details for Bug 519233 – better ctrl-c handling

[patch] better ctrl-c handling

ctrl-c.patch (text/plain), 1.64 KB, created by Zdeněk Pavlas on 2012-06-15 13:27:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zdeněk Pavlas

Created: 2012-06-15 13:27:36 UTC

Size: 1.64 KB

patch

obsolete

>diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
>index 172e564..e38320e 100644
>--- a/urlgrabber/grabber.py
>+++ b/urlgrabber/grabber.py
>@@ -1028,6 +1028,8 @@ class URLGrabber(object):
>             except KeyboardInterrupt, e:
>                 exception = e
>                 callback = opts.interrupt_callback
>+                if not callback:
>+                    raise
> 
>             if DEBUG: DEBUG.info('exception: %s', exception)
>             if callback:
>@@ -1403,7 +1405,22 @@ class PyCurlFileObject(object):
>             return
>         
>         try:
>-            self.curl_obj.perform()
>+            m = pycurl.CurlMulti()
>+            m.add_handle(self.curl_obj)
>+            while True:
>+                if m.perform()[0] == -1:
>+                    continue
>+                num, ok, err = m.info_read()
>+                if ok:
>+                    m.remove_handle(self.curl_obj)
>+                    break
>+                if err:
>+                    m.remove_handle(self.curl_obj)
>+                    raise pycurl.error(*err[0][1:])
>+                if m.select(.1) == -1:
>+                    # probably a bug in CurlMulti, removing
>+                    # a handle here triggers double free()
>+                    raise KeyboardInterrupt
>         except pycurl.error, e:
>             # XXX - break some of these out a bit more clearly
>             # to other URLGrabErrors from 
>@@ -1549,7 +1566,6 @@ class PyCurlFileObject(object):
> 
>     def _do_open(self):
>         self.curl_obj = _curl_cache
>-        self.curl_obj.reset() # reset all old settings away, just in case
>         # setup any ranges
>         self._set_opts()
>         self._do_grab()

Actions: View | Diff

Attachments on bug 519233: 573779 | 592127