diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-09-20 13:26:03 +0200 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-09-20 13:26:03 +0200 |
| commit | c40c6aaaaa80db619459be3bd7f93853da70be0d (patch) | |
| tree | 98e7c27a4ad4e8cbe1add6fd4dbe241d348f6b0f | |
| parent | 1a810f0d4e63ba702e49b7404c3f5f74ef716759 (diff) | |
| download | youtube-dl-c40c6aaaaa80db619459be3bd7f93853da70be0d.tar.gz youtube-dl-c40c6aaaaa80db619459be3bd7f93853da70be0d.tar.xz youtube-dl-c40c6aaaaa80db619459be3bd7f93853da70be0d.zip | |
Catch socket.error before IOError
Since python 2.6 it's a child class.
| -rw-r--r-- | youtube_dl/YoutubeDL.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index de2b133e0..d999099fe 100644 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -544,11 +544,11 @@ class YoutubeDL(object): else: try: success = self.fd._do_download(filename, info_dict) - except (OSError, IOError) as err: - raise UnavailableVideoError(err) except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err: self.report_error(u'unable to download video data: %s' % str(err)) return + except (OSError, IOError) as err: + raise UnavailableVideoError(err) except (ContentTooShortError, ) as err: self.report_error(u'content too short (expected %s bytes and served %s)' % (err.expected, err.downloaded)) return |