diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-09-30 11:12:59 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-10-01 00:08:34 +0200 |
| commit | e7b6d12254702a4aa6a9f54420f80e6ea456b120 (patch) | |
| tree | 46620b2f0829ff030780853cc70d18a94762ece3 /youtube_dl/extractor/common.py | |
| parent | 410f3e73ab268f74a455798ee39de5caba90caea (diff) | |
| download | youtube-dl-e7b6d12254702a4aa6a9f54420f80e6ea456b120.tar.xz | |
[utils] Improve and test js_to_json
Diffstat (limited to 'youtube_dl/extractor/common.py')
| -rw-r--r-- | youtube_dl/extractor/common.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index f43a0a569..611cf95f1 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -334,7 +334,11 @@ class InfoExtractor(object): try: return json.loads(json_string) except ValueError as ve: - raise ExtractorError('Failed to download JSON', cause=ve) + errmsg = '%s: Failed to parse JSON ' % video_id + if fatal: + raise ExtractorError(errmsg, cause=ve) + else: + self.report_warning(errmsg + str(ve)) def report_warning(self, msg, video_id=None): idstr = '' if video_id is None else '%s: ' % video_id |