diff options
| author | Ismael Mejia <iemejia@gmail.com> | 2013-08-22 23:29:36 +0200 |
|---|---|---|
| committer | Ismael Mejia <iemejia@gmail.com> | 2013-08-22 23:29:36 +0200 |
| commit | 18b4e04f1c663e0ea695f6501b860f85af9d7ca1 (patch) | |
| tree | d60ebbf51b8c50f808c6c251fc6c02547052a9dc /youtube_dl/YoutubeDL.py | |
| parent | d80a064eff4fe2416f9db36b07f1e2ca641f1334 (diff) | |
| parent | 1865ed31b955795f9859df5c1c400d172ae9a28a (diff) | |
Merge branch 'master' into subtitles_rework
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
| -rw-r--r-- | youtube_dl/YoutubeDL.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index e11d6f994..fa7bb1387 100644 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -261,7 +261,7 @@ class YoutubeDL(object): self.report_error(u'Erroneous output template') return None except ValueError as err: - self.report_error(u'Insufficient system charset ' + repr(preferredencoding())) + self.report_error(u'Error in output template: ' + str(err) + u' (encoding: ' + repr(preferredencoding()) + ')') return None def _match_entry(self, info_dict): @@ -535,7 +535,7 @@ class YoutubeDL(object): try: success = self.fd._do_download(filename, info_dict) except (OSError, IOError) as err: - raise UnavailableVideoError() + 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 @@ -582,7 +582,7 @@ class YoutubeDL(object): # No clear decision yet, let IE decide keep_video = keep_video_wish except PostProcessingError as e: - self.to_stderr(u'ERROR: ' + e.msg) + self.report_error(e.msg) if keep_video is False and not self.params.get('keepvideo', False): try: self.to_screen(u'Deleting original file %s (pass -k to keep)' % filename) |