diff options
| author | Lukáš Lalinský <lukas@oxygene.sk> | 2015-10-20 10:30:31 +0200 |
|---|---|---|
| committer | Lukáš Lalinský <lukas@oxygene.sk> | 2015-10-20 10:31:32 +0200 |
| commit | b6aa99aff8278142fed94e37e500f1cfb62defd1 (patch) | |
| tree | 2144be411576a8b79dab3ae3e50fa753a11bdeb7 | |
| parent | 7b091c370c0f187545df8b1b1cc990fcf95df108 (diff) | |
| download | youtube-dl-b6aa99aff8278142fed94e37e500f1cfb62defd1.tar.gz youtube-dl-b6aa99aff8278142fed94e37e500f1cfb62defd1.tar.xz youtube-dl-b6aa99aff8278142fed94e37e500f1cfb62defd1.zip | |
[vimeo] Fix error parsing
| -rw-r--r-- | youtube_dl/extractor/vimeo.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py index 0f84656c0..bdec79341 100644 --- a/youtube_dl/extractor/vimeo.py +++ b/youtube_dl/extractor/vimeo.py @@ -273,13 +273,13 @@ class VimeoIE(VimeoBaseInfoExtractor): self.report_extraction(video_id) vimeo_config = self._search_regex( - r'vimeo\.config\s*=\s*({.+?});', webpage, + r'vimeo\.config\s*=\s*(?:({.+?})|_extend\([^,]+,\s+({.+?})\));', webpage, 'vimeo config', default=None) if vimeo_config: seed_status = self._parse_json(vimeo_config, video_id).get('seed_status', {}) if seed_status.get('state') == 'failed': raise ExtractorError( - '%s returned error: %s' % (self.IE_NAME, seed_status['title']), + '%s said: %s' % (self.IE_NAME, seed_status['title']), expected=True) # Extract the config JSON |