aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/FileDownloader.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-03-08 20:12:05 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2013-03-08 20:12:05 +0100
commite5edd51de458d52f3824e6d8fc7c0713659694a4 (patch)
tree1ba31d9cbcadde4394d3c7d8a2adbb5ae6b26871 /youtube_dl/FileDownloader.py
parentc2e21f2f0da6a2ec682fab3ba75b1aae98586c96 (diff)
Clear up error messages (#734)
Diffstat (limited to 'youtube_dl/FileDownloader.py')
-rw-r--r--youtube_dl/FileDownloader.py7
1 files changed, 5 insertions, 2 deletions
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):