aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/InfoExtractors.py
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2012-12-11 12:15:16 +0100
committerFilippo Valsorda <filippo.valsorda@gmail.com>2012-12-11 12:15:16 +0100
commit95eb771dcda47f948b050da85c7ff22539e3ee12 (patch)
tree3bea4b6975544ef76241ccf402de541da350b4ac /youtube_dl/InfoExtractors.py
parent3c6ffbaedbbae8734f6b86fea1169413b656abf3 (diff)
parent4fb1acc212555e3e817f858dce964876eef75d85 (diff)
downloadyoutube-dl-95eb771dcda47f948b050da85c7ff22539e3ee12.tar.xz
Merge branch 'master' into fork_master
Conflicts: .travis.yml
Diffstat (limited to 'youtube_dl/InfoExtractors.py')
-rw-r--r--youtube_dl/InfoExtractors.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 49976c25b..9cfff153b 100644
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -1072,8 +1072,8 @@ class VimeoIE(InfoExtractor):
self.report_extraction(video_id)
# Extract the config JSON
- config = webpage.split(' = {config:')[1].split(',assets:')[0]
try:
+ config = webpage.split(' = {config:')[1].split(',assets:')[0]
config = json.loads(config)
except:
self._downloader.trouble(u'ERROR: unable to extract info section')