From: Philipp Hagemeister Date: Fri, 8 Mar 2013 19:12:05 +0000 (+0100) Subject: Clear up error messages (#734) X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=e5edd51de458d52f3824e6d8fc7c0713659694a4;p=youtube-dl Clear up error messages (#734) --- diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index 57f741c30..3b2adf84b 100644 --- a/youtube_dl/FileDownloader.py +++ b/youtube_dl/FileDownloader.py @@ -372,8 +372,11 @@ class FileDownloader(object): filename = self.params['outtmpl'] % template_dict return filename - except (ValueError, KeyError) as err: - self.trouble(u'ERROR: invalid system charset or erroneous output template') + except KeyError as err: + self.trouble(u'ERROR: Erroneous output template') + return None + except ValueError as err: + self.trouble(u'ERROR: Insufficient system charset ' + repr(preferredencoding())) return None def _match_entry(self, info_dict):